MDL-44101 Javascript: Apply widget-focusonclose to some core dialogues

Conflicts: lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
moodle · Feb 24, 2014 · 29ee3cf · 29ee3cf
1 parent 7ae6ce0
commit 29ee3cf
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 14 deletions.
diff --git a/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-debug.js b/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-debug.js
@@ -47,6 +47,7 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
             modal: true, // This dialogue should be modal.
             shim : true,
             closeButtonTitle : this.get('closeButtonTitle'),
+            focusOnPreviousTargetAfterHide: true,
             render : false
         };
 
@@ -155,7 +156,7 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
         this.options.removeAttribute('disabled');
 
         // Display the panel
-        this.panel.show();
+        this.panel.show(e);
 
         // Re-centre the dialogue after we've shown it.
         this.center_dialogue(dialogue);

diff --git a/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-min.js b/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-min.js
diff --git a/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue.js b/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue.js
@@ -47,6 +47,7 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
             modal: true, // This dialogue should be modal.
             shim : true,
             closeButtonTitle : this.get('closeButtonTitle'),
+            focusOnPreviousTargetAfterHide: true,
             render : false
         };
 
@@ -155,7 +156,7 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
         this.options.removeAttribute('disabled');
 
         // Display the panel
-        this.panel.show();
+        this.panel.show(e);
 
         // Re-centre the dialogue after we've shown it.
         this.center_dialogue(dialogue);

diff --git a/lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js b/lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
@@ -589,6 +589,8 @@ Y.Base.modifyAttrs(DIALOGUE, {
     }
 });
 
+Y.Base.mix(DIALOGUE, [Y.M.core.WidgetFocusAfterHide]);
+
 M.core.dialogue = DIALOGUE;
 /**
  * A dialogue type designed to display informative messages to users.
@@ -648,4 +650,14 @@ M.core.notification = M.core.notification || {};
 M.core.notification.info = INFO;
 
 
-}, '@VERSION@', {"requires": ["base", "node", "panel", "event-key", "dd-plugin", "moodle-core-lockscroll"]});
+}, '@VERSION@', {
+    "requires": [
+        "base",
+        "node",
+        "panel",
+        "event-key",
+        "dd-plugin",
+        "moodle-core-widget-focusafterclose",
+        "moodle-core-lockscroll"
+    ]
+});