MDL-59383 core_modal: trigger event on modal module

robjoyce · Jul 12, 2017 · d4a87aa · d4a87aa
1 parent 331785d
commit d4a87aa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/calendar/amd/build/calendar.min.js b/calendar/amd/build/calendar.min.js
diff --git a/calendar/amd/src/calendar.js b/calendar/amd/src/calendar.js
@@ -69,14 +69,7 @@ define(['jquery', 'core/ajax', 'core/str', 'core/templates', 'core/notification'
             }).then(function(eventdata) {
                 return modalPromise.done(function(modal) {
                     modal.setTitle(eventdata.name);
-
-                    Templates.render(
-                        'core_calendar/event_summary_body',
-                        eventdata
-                    ).done(function(html, js) {
-                        Templates.replaceNodeContents(modal.getBody(), html, js);
-                    });
-
+                    modal.setBody(Templates.render('core_calendar/event_summary_body', eventdata));
                     // Hide edit and delete buttons if I don't have permission.
                     if (eventdata.caneditevent == false) {
                         modal.setFooter('');

diff --git a/lib/amd/build/modal.min.js b/lib/amd/build/modal.min.js
diff --git a/lib/amd/src/modal.js b/lib/amd/src/modal.js
@@ -23,8 +23,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 define(['jquery', 'core/templates', 'core/notification', 'core/key_codes',
-        'core/custom_interaction_events', 'core/modal_backdrop', 'core/modal_events'],
-     function($, Templates, Notification, KeyCodes, CustomEvents, ModalBackdrop, ModalEvents) {
+        'core/custom_interaction_events', 'core/modal_backdrop', 'core/event', 'core/modal_events'],
+     function($, Templates, Notification, KeyCodes, CustomEvents, ModalBackdrop, Event, ModalEvents) {
 
     var SELECTORS = {
         CONTAINER: '[data-region="modal-container"]',
@@ -239,6 +239,7 @@ define(['jquery', 'core/templates', 'core/notification', 'core/key_codes',
         if (typeof value === 'string') {
             // Just set the value if it's a string.
             body.html(value);
+            Event.notifyFilterContentUpdated(body);
         } else {
             // Otherwise we assume it's a promise to be resolved with
             // html and javascript.
@@ -257,6 +258,7 @@ define(['jquery', 'core/templates', 'core/notification', 'core/key_codes',
                             this.bodyJS = js;
                         }
                     }
+                    Event.notifyFilterContentUpdated(body);
                 }.bind(this));
             }.bind(this));
         }