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

lib/yui/build/moodle-core-notification/moodle-core-notification-debug.js

@@ -95,6 +95,17 @@ Y.extend(DIALOGUE, Y.Panel, {
             }
         }
     },
+    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;
+            }
+        }
+
+        return DIALOGUE.superclass.hide.call(this, arguments);
+    },
     centerDialogue : function() {
         var bb = this.get('boundingBox'),
             hidden = bb.hasClass(DIALOGUE_PREFIX+'-hidden'),

lib/yui/build/moodle-core-notification/moodle-core-notification.js

@@ -95,6 +95,17 @@ Y.extend(DIALOGUE, Y.Panel, {
             }
         }
     },
+    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;
+            }
+        }
+
+        return DIALOGUE.superclass.hide.call(this, arguments);
+    },
     centerDialogue : function() {
         var bb = this.get('boundingBox'),
             hidden = bb.hasClass(DIALOGUE_PREFIX+'-hidden'),

lib/yui/src/notification/js/notification.js

@@ -93,6 +93,17 @@ Y.extend(DIALOGUE, Y.Panel, {
             }
         }
     },
+    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;
+            }
+        }
+
+        return DIALOGUE.superclass.hide.call(this, arguments);
+    },
     centerDialogue : function() {
         var bb = this.get('boundingBox'),
             hidden = bb.hasClass(DIALOGUE_PREFIX+'-hidden'),