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

Merge branch 'wip-MDL-54986-30' of https://github.com/Beedell/moodle into MOODLE_30_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2016-11-04 14:31:19 +00:00
parent fbbe6c88d6 7c882f4389
commit 1642ba1ea3
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/yui/build/moodle-core-actionmenu/moodle-core-actionmenu-debug.js
Vendored
+2 -2
View File
@@ -152,7 +152,7 @@ ACTIONMENU.prototype = {
if (!menucontent.hasClass('align-'+align)) {
menucontent.addClass('align-'+align);
}
if (menucontent.hasChildNodes()) {
if (menucontent.getDOMNode().childElementCount) {
menu.setAttribute('data-enhanced', '1');
}
},
@@ -450,7 +450,7 @@ ACTIONMENU.prototype = {
this.constrain(menucontent.set('aria-hidden', false));
this.menuChildren = this.dialogue.all(SELECTOR.MENUCHILD);
if (this.menuChildren) {
if (this.menuChildren.size() > 0) {
this.firstMenuChild = this.menuChildren.item(0);
this.lastMenuChild = this.menuChildren.item(this.menuChildren.size() - 1);
lib/yui/build/moodle-core-actionmenu/moodle-core-actionmenu-min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
lib/yui/build/moodle-core-actionmenu/moodle-core-actionmenu.js
Vendored
+2 -2
View File
@@ -151,7 +151,7 @@ ACTIONMENU.prototype = {
if (!menucontent.hasClass('align-'+align)) {
menucontent.addClass('align-'+align);
}
if (menucontent.hasChildNodes()) {
if (menucontent.getDOMNode().childElementCount) {
menu.setAttribute('data-enhanced', '1');
}
},
@@ -446,7 +446,7 @@ ACTIONMENU.prototype = {
this.constrain(menucontent.set('aria-hidden', false));
this.menuChildren = this.dialogue.all(SELECTOR.MENUCHILD);
if (this.menuChildren) {
if (this.menuChildren.size() > 0) {
this.firstMenuChild = this.menuChildren.item(0);
this.lastMenuChild = this.menuChildren.item(this.menuChildren.size() - 1);
lib/yui/src/actionmenu/js/actionmenu.js
Vendored
+2 -2
View File
@@ -150,7 +150,7 @@ ACTIONMENU.prototype = {
if (!menucontent.hasClass('align-'+align)) {
menucontent.addClass('align-'+align);
}
if (menucontent.hasChildNodes()) {
if (menucontent.getDOMNode().childElementCount) {
menu.setAttribute('data-enhanced', '1');
}
},
@@ -448,7 +448,7 @@ ACTIONMENU.prototype = {
this.constrain(menucontent.set('aria-hidden', false));
this.menuChildren = this.dialogue.all(SELECTOR.MENUCHILD);
if (this.menuChildren) {
if (this.menuChildren.size() > 0) {
this.firstMenuChild = this.menuChildren.item(0);
this.lastMenuChild = this.menuChildren.item(this.menuChildren.size() - 1);