Merge branch 'MDL-65671-master' of git://github.com/lameze/moodle

moodle · Jun 13, 2019 · d053310 · d053310
2 parents f568841 + e5ab472
commit d053310
Show file tree

Hide file tree

Showing 27 changed files with 212 additions and 36 deletions.
diff --git a/calendar/amd/build/calendar.min.js b/calendar/amd/build/calendar.min.js
diff --git a/calendar/amd/build/calendar_threemonth.min.js b/calendar/amd/build/calendar_threemonth.min.js
diff --git a/calendar/amd/build/selectors.min.js b/calendar/amd/build/selectors.min.js
diff --git a/calendar/amd/build/view_manager.min.js b/calendar/amd/build/view_manager.min.js
diff --git a/calendar/amd/src/calendar.js b/calendar/amd/src/calendar.js
@@ -172,6 +172,22 @@ define([
      * @param {object} root The calendar root element
      */
     var registerEventListeners = function(root) {
+        // Listen the click on the day link to render the day view.
+        root.on('click', SELECTORS.VIEW_DAY_LINK, function(e) {
+            var dayLink = $(e.target);
+            var year = dayLink.data('year'),
+                month = dayLink.data('month'),
+                day = dayLink.data('day'),
+                courseId = dayLink.data('courseid'),
+                categoryId = dayLink.data('categoryid');
+            CalendarViewManager.refreshDayContent(root, year, month, day, courseId, categoryId, root,
+                    'core_calendar/calendar_day').then(function() {
+                e.preventDefault();
+                var url = '?view=day&time=' + dayLink.data('timestamp');
+                return window.history.pushState({}, '', url);
+            }).fail(Notification.exception);
+        });
+
         root.on('change', CalendarSelectors.elements.courseSelector, function() {
             var selectElement = $(this);
             var courseId = selectElement.val();