moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-45359-master' of git://github.com/andrewnicols/moodle

Browse source 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
This commit is contained in:
Damyon Wiese 2014-05-05 17:24:08 +08:00
commit 6d8617bed9
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js vendored
View file

@ -171,8 +171,10 @@ Y.extend(DIALOGUE, Y.Panel, {
// Only set the zindex if we found a wrapper. // Only set the zindex if we found a wrapper.
zindexvalue = (highestzindex + 1).toString(); zindexvalue = (highestzindex + 1).toString();
bb.setStyle('zIndex', zindexvalue); bb.setStyle('zIndex', zindexvalue);
ol.setStyle('zIndex', zindexvalue);
this.set('zIndex', zindexvalue); this.set('zIndex', zindexvalue);
if (this.get('modal')) {
ol.setStyle('zIndex', zindexvalue);
}
this._calculatedzindex = true; this._calculatedzindex = true;
} }
}, },

4
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js vendored
View file

File diff suppressed because one or more lines are too long

4
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js vendored
View file

@ -171,8 +171,10 @@ Y.extend(DIALOGUE, Y.Panel, {
// Only set the zindex if we found a wrapper. // Only set the zindex if we found a wrapper.
zindexvalue = (highestzindex + 1).toString(); zindexvalue = (highestzindex + 1).toString();
bb.setStyle('zIndex', zindexvalue); bb.setStyle('zIndex', zindexvalue);
ol.setStyle('zIndex', zindexvalue);
this.set('zIndex', zindexvalue); this.set('zIndex', zindexvalue);
if (this.get('modal')) {
ol.setStyle('zIndex', zindexvalue);
}
this._calculatedzindex = true; this._calculatedzindex = true;
} }
}, },

4
lib/yui/src/notification/js/dialogue.js vendored
View file

@ -142,8 +142,10 @@ Y.extend(DIALOGUE, Y.Panel, {
// Only set the zindex if we found a wrapper. // Only set the zindex if we found a wrapper.
zindexvalue = (highestzindex + 1).toString(); zindexvalue = (highestzindex + 1).toString();
bb.setStyle('zIndex', zindexvalue); bb.setStyle('zIndex', zindexvalue);
ol.setStyle('zIndex', zindexvalue);
this.set('zIndex', zindexvalue); this.set('zIndex', zindexvalue);
if (this.get('modal')) {
ol.setStyle('zIndex', zindexvalue);
}
this._calculatedzindex = true; this._calculatedzindex = true;
} }
}, },