L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-45096 block_navigation: Check for existence of the siteadminbranch before modifying it

Browse Source 
Prevents JS errors in some themes when admin block is hidden
This commit is contained in:
Steve Clay
2014-04-22 16:32:42 +08:00
committed by Andrew Nicols
parent d55806ce05
commit d8edfff658
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-debug.js
Vendored
+6 -4
View File
@@ -276,10 +276,12 @@ TREE.prototype = {
M.block_navigation.expandablebranchcount++;
this.branches[siteadminbranch.get('id')] = siteadminbranch;
// Remove link on site admin with JS to keep old UI.
var siteadminlinknode = siteadminbranch.node.get('childNodes').item(0);
if (siteadminlinknode) {
var siteadminnode = Y.Node.create('<span tabindex="0">'+siteadminlinknode.get('innerHTML')+'</span>');
siteadminbranch.node.replaceChild(siteadminnode, siteadminlinknode);
if (siteadminbranch.node) {
var siteadminlinknode = siteadminbranch.node.get('childNodes').item(0);
if (siteadminlinknode) {
var siteadminnode = Y.Node.create('<span tabindex="0">'+siteadminlinknode.get('innerHTML')+'</span>');
siteadminbranch.node.replaceChild(siteadminnode, siteadminlinknode);
}
}
}
if (M.block_navigation.expandablebranchcount > 0) {
blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation.js
Vendored
+6 -4
View File
@@ -275,10 +275,12 @@ TREE.prototype = {
M.block_navigation.expandablebranchcount++;
this.branches[siteadminbranch.get('id')] = siteadminbranch;
// Remove link on site admin with JS to keep old UI.
var siteadminlinknode = siteadminbranch.node.get('childNodes').item(0);
if (siteadminlinknode) {
var siteadminnode = Y.Node.create('<span tabindex="0">'+siteadminlinknode.get('innerHTML')+'</span>');
siteadminbranch.node.replaceChild(siteadminnode, siteadminlinknode);
if (siteadminbranch.node) {
var siteadminlinknode = siteadminbranch.node.get('childNodes').item(0);
if (siteadminlinknode) {
var siteadminnode = Y.Node.create('<span tabindex="0">'+siteadminlinknode.get('innerHTML')+'</span>');
siteadminbranch.node.replaceChild(siteadminnode, siteadminlinknode);
}
}
}
if (M.block_navigation.expandablebranchcount > 0) {
blocks/navigation/yui/src/navigation/js/navigation.js
Vendored
+6 -4
View File
@@ -274,10 +274,12 @@ TREE.prototype = {
M.block_navigation.expandablebranchcount++;
this.branches[siteadminbranch.get('id')] = siteadminbranch;
// Remove link on site admin with JS to keep old UI.
var siteadminlinknode = siteadminbranch.node.get('childNodes').item(0);
if (siteadminlinknode) {
var siteadminnode = Y.Node.create('<span tabindex="0">'+siteadminlinknode.get('innerHTML')+'</span>');
siteadminbranch.node.replaceChild(siteadminnode, siteadminlinknode);
if (siteadminbranch.node) {
var siteadminlinknode = siteadminbranch.node.get('childNodes').item(0);
if (siteadminlinknode) {
var siteadminnode = Y.Node.create('<span tabindex="0">'+siteadminlinknode.get('innerHTML')+'</span>');
siteadminbranch.node.replaceChild(siteadminnode, siteadminlinknode);
}
}
}
if (M.block_navigation.expandablebranchcount > 0) {