MDL-60558 calendar: Move edit event to CRUD

moodle · Nov 2, 2017 · 8242027 · 8242027
1 parent fd2f1ae
commit 8242027
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 17 deletions.
diff --git a/calendar/amd/build/calendar.min.js b/calendar/amd/build/calendar.min.js
diff --git a/calendar/amd/build/calendar_view.min.js b/calendar/amd/build/calendar_view.min.js
diff --git a/calendar/amd/build/crud.min.js b/calendar/amd/build/crud.min.js
diff --git a/calendar/amd/src/calendar.js b/calendar/amd/src/calendar.js
@@ -163,19 +163,7 @@ define([
             CalendarViewManager.reloadCurrentMonth(root);
         });
 
-        eventFormModalPromise
-        .then(function(modal) {
-            // When something within the calendar tells us the user wants
-            // to edit an event then show the event form modal.
-            body.on(CalendarEvents.editEvent, function(e, eventId) {
-                var calendarWrapper = root.find(CalendarSelectors.wrapper);
-                modal.setEventId(eventId);
-                modal.setContextId(calendarWrapper.data('contextId'));
-                modal.show();
-            });
-            return;
-        })
-        .fail(Notification.exception);
+        CalendarCrud.registerEditListeners(root, eventFormModalPromise);
     };
 
     /**

diff --git a/calendar/amd/src/calendar_view.js b/calendar/amd/src/calendar_view.js
@@ -51,7 +51,6 @@ define([
         var registerEventListeners = function(root, type) {
             var body = $('body');
 
-            CalendarCrud.registerEventFormModal(root);
             CalendarCrud.registerRemove(root);
 
             var reloadFunction = 'reloadCurrent' + type.charAt(0).toUpperCase() + type.slice(1);
@@ -85,6 +84,9 @@ define([
                     daysWithEvent.removeClass('hidden');
                 }
             });
+
+            var eventFormPromise = CalendarCrud.registerEventFormModal(root);
+            CalendarCrud.registerEditListeners(root, eventFormPromise);
         };
 
         return {

diff --git a/calendar/amd/src/crud.js b/calendar/amd/src/crud.js
@@ -198,6 +198,8 @@ function(
 
                 modal.setContextId(calendarWrapper.data('contextId'));
                 modal.show();
+
+                e.stopImmediatePropagation();
                 return;
             }).fail(Notification.exception);
         });
@@ -223,8 +225,36 @@ function(
         });
     }
 
+    /**
+     * Register the listeners required to edit the event.
+     *
+     * @param   {jQuery} root
+     * @param   {Promise} eventFormModalPromise
+     * @returns {Promise}
+     */
+    function registerEditListeners(root, eventFormModalPromise) {
+        eventFormModalPromise
+        .then(function(modal) {
+            // When something within the calendar tells us the user wants
+            // to edit an event then show the event form modal.
+            $('body').on(CalendarEvents.editEvent, function(e, eventId) {
+                var calendarWrapper = root.find(CalendarSelectors.wrapper);
+                modal.setEventId(eventId);
+                modal.setContextId(calendarWrapper.data('contextId'));
+                modal.show();
+
+                e.stopImmediatePropagation();
+            });
+            return;
+        })
+        .fail(Notification.exception);
+
+        return eventFormModalPromise;
+    }
+
     return {
         registerRemove: registerRemove,
+        registerEditListeners: registerEditListeners,
         registerEventFormModal: registerEventFormModal
     };
 });