mirror of
https://github.com/moodle/moodle.git
synced 2025-04-21 00:12:56 +02:00
Merge branch 'MDL-45359-master' of git://github.com/andrewnicols/moodle
Conflicts: lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
This commit is contained in:
commit
6d8617bed9
@ -171,8 +171,10 @@ Y.extend(DIALOGUE, Y.Panel, {
|
||||
// Only set the zindex if we found a wrapper.
|
||||
zindexvalue = (highestzindex + 1).toString();
|
||||
bb.setStyle('zIndex', zindexvalue);
|
||||
ol.setStyle('zIndex', zindexvalue);
|
||||
this.set('zIndex', zindexvalue);
|
||||
if (this.get('modal')) {
|
||||
ol.setStyle('zIndex', zindexvalue);
|
||||
}
|
||||
this._calculatedzindex = true;
|
||||
}
|
||||
},
|
||||
|
File diff suppressed because one or more lines are too long
@ -171,8 +171,10 @@ Y.extend(DIALOGUE, Y.Panel, {
|
||||
// Only set the zindex if we found a wrapper.
|
||||
zindexvalue = (highestzindex + 1).toString();
|
||||
bb.setStyle('zIndex', zindexvalue);
|
||||
ol.setStyle('zIndex', zindexvalue);
|
||||
this.set('zIndex', zindexvalue);
|
||||
if (this.get('modal')) {
|
||||
ol.setStyle('zIndex', zindexvalue);
|
||||
}
|
||||
this._calculatedzindex = true;
|
||||
}
|
||||
},
|
||||
|
4
lib/yui/src/notification/js/dialogue.js
vendored
4
lib/yui/src/notification/js/dialogue.js
vendored
@ -142,8 +142,10 @@ Y.extend(DIALOGUE, Y.Panel, {
|
||||
// Only set the zindex if we found a wrapper.
|
||||
zindexvalue = (highestzindex + 1).toString();
|
||||
bb.setStyle('zIndex', zindexvalue);
|
||||
ol.setStyle('zIndex', zindexvalue);
|
||||
this.set('zIndex', zindexvalue);
|
||||
if (this.get('modal')) {
|
||||
ol.setStyle('zIndex', zindexvalue);
|
||||
}
|
||||
this._calculatedzindex = true;
|
||||
}
|
||||
},
|
||||
|
Loading…
x
Reference in New Issue
Block a user