MDL-59784 core: Modal factory should listen before fetching templates

moodle · Aug 18, 2017 · 1896e25 · 1896e25
1 parent 5607739
commit 1896e25
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/lib/amd/build/modal_factory.min.js b/lib/amd/build/modal_factory.min.js
diff --git a/lib/amd/src/modal_factory.js b/lib/amd/src/modal_factory.js
@@ -55,19 +55,27 @@ define(['jquery', 'core/modal_events', 'core/modal_registry', 'core/modal',
      * is closed.
      *
      * @method setUpTrigger
-     * @param {object} modal The modal instance
+     * @param {Promise} modalPromise The modal instance
      * @param {object} triggerElement The jQuery element to open the modal
      */
-    var setUpTrigger = function(modal, triggerElement) {
+    var setUpTrigger = function(modalPromise, triggerElement) {
         if (typeof triggerElement != 'undefined') {
             CustomEvents.define(triggerElement, [CustomEvents.events.activate]);
             triggerElement.on(CustomEvents.events.activate, function(e, data) {
-                modal.show();
+                modalPromise.then(function(modal) {
+                    modal.show();
+
+                    return modal;
+                });
                 data.originalEvent.preventDefault();
             });
 
-            modal.getRoot().on(ModalEvents.hidden, function() {
-                triggerElement.focus();
+            modalPromise.then(function(modal) {
+                modal.getRoot().on(ModalEvents.hidden, function() {
+                    triggerElement.focus();
+                });
+
+                return modal;
             });
         }
     };
@@ -82,11 +90,10 @@ define(['jquery', 'core/modal_events', 'core/modal_registry', 'core/modal',
      * @param {object} triggerElement The trigger HTML jQuery object
      * @return {object} Modal instance
      */
-    var createFromElement = function(registryConf, modalElement, triggerElement) {
+    var createFromElement = function(registryConf, modalElement) {
         modalElement = $(modalElement);
         var module = registryConf.module;
         var modal = new module(modalElement);
-        setUpTrigger(modal, triggerElement);
 
         return modal;
     };
@@ -104,12 +111,16 @@ define(['jquery', 'core/modal_events', 'core/modal_registry', 'core/modal',
     var createFromType = function(registryConf, triggerElement) {
         var templateName = registryConf.template;
 
-        return Templates.render(templateName, {})
+        var modalPromise = Templates.render(templateName, {})
             .then(function(html) {
                 var modalElement = $(html);
-                return createFromElement(registryConf, modalElement, triggerElement);
+                return createFromElement(registryConf, modalElement);
             })
             .fail(Notification.exception);
+
+        setUpTrigger(modalPromise, triggerElement);
+
+        return modalPromise;
     };
 
     /**