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

NoelDeMartin · Nov 4, 2016 · f95c00e · f95c00e
2 parents b7b5b35 + 6e1e299
commit f95c00e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/lib/yui/build/moodle-core-actionmenu/moodle-core-actionmenu-debug.js b/lib/yui/build/moodle-core-actionmenu/moodle-core-actionmenu-debug.js
@@ -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);
 

diff --git a/lib/yui/build/moodle-core-actionmenu/moodle-core-actionmenu-min.js b/lib/yui/build/moodle-core-actionmenu/moodle-core-actionmenu-min.js
diff --git a/lib/yui/build/moodle-core-actionmenu/moodle-core-actionmenu.js b/lib/yui/build/moodle-core-actionmenu/moodle-core-actionmenu.js
@@ -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);
 

diff --git a/lib/yui/src/actionmenu/js/actionmenu.js b/lib/yui/src/actionmenu/js/actionmenu.js
@@ -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);