mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-44079 Javascript: Check whether a dialogue is focused before closing

Browse Source
This commit is contained in:
Andrew Nicols 2014-02-11 11:26:46 +08:00
parent 974c2cdc03
commit bf24abd221
4 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js vendored
View File

@ -340,7 +340,15 @@ Y.extend(DIALOGUE, Y.Panel, {
return result;
},
hide: function() {
hide: function(e) {
if (e) {
// If the event was closed by an escape key event, then we need to check that this
// dialogue is currently focused to prevent closing all dialogues in the stack.
if (e.type === 'key' && e.keyCode === 27 && !this.get('focused')) {
return;
}
}
// Unlock scroll if the plugin is present.
if (this.lockScroll) {
this.lockScroll.disableScrollLock();

2
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

10
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js vendored
View File

@ -340,7 +340,15 @@ Y.extend(DIALOGUE, Y.Panel, {
return result;
},
hide: function() {
hide: function(e) {
if (e) {
// If the event was closed by an escape key event, then we need to check that this
// dialogue is currently focused to prevent closing all dialogues in the stack.
if (e.type === 'key' && e.keyCode === 27 && !this.get('focused')) {
return;
}
}
// Unlock scroll if the plugin is present.
if (this.lockScroll) {
this.lockScroll.disableScrollLock();

10
lib/yui/src/notification/js/dialogue.js vendored
View File

@ -309,7 +309,15 @@ Y.extend(DIALOGUE, Y.Panel, {
return result;
},
hide: function() {
hide: function(e) {
if (e) {
// If the event was closed by an escape key event, then we need to check that this
// dialogue is currently focused to prevent closing all dialogues in the stack.
if (e.type === 'key' && e.keyCode === 27 && !this.get('focused')) {
return;
}
}
// Unlock scroll if the plugin is present.
if (this.lockScroll) {
this.lockScroll.disableScrollLock();