mirror of
https://github.com/moodle/moodle.git
synced 2025-01-19 06:18:28 +01:00
Merge branch 'wip-MDL-54986-master' of https://github.com/Beedell/moodle
This commit is contained in:
commit
f95c00e551
@ -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);
|
||||
|
||||
|
File diff suppressed because one or more lines are too long
@ -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);
|
||||
|
||||
|
4
lib/yui/src/actionmenu/js/actionmenu.js
vendored
4
lib/yui/src/actionmenu/js/actionmenu.js
vendored
@ -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);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user