MDL-59388 core_calendar: fix month view on clean theme

NoelDeMartin · Aug 16, 2017 · 836aa3f · 836aa3f
1 parent a4af4c9
commit 836aa3f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 30 deletions.
diff --git a/calendar/amd/build/view_manager.min.js b/calendar/amd/build/view_manager.min.js
diff --git a/calendar/amd/src/view_manager.js b/calendar/amd/src/view_manager.js
@@ -38,7 +38,7 @@ define(['jquery', 'core/templates', 'core/notification', 'core_calendar/reposito
         var registerEventListeners = function(root) {
             root = $(root);
 
-            $(root).on('click', SELECTORS.CALENDAR_NAV_LINK, function(e) {
+            root.on('click', SELECTORS.CALENDAR_NAV_LINK, function(e) {
                 var courseId = $(root).find(SELECTORS.CALENDAR_MONTH_WRAPPER).data('courseid');
                 var link = $(e.currentTarget);
                 changeMonth(link.attr('href'), link.data('time'), courseId);
@@ -58,16 +58,13 @@ define(['jquery', 'core/templates', 'core/notification', 'core_calendar/reposito
             CalendarRepository.getCalendarMonthData(time, courseid)
             .then(function(context) {
                 window.history.pushState({}, '', url);
-
                 return Templates.render('core_calendar/month_detailed', context);
             })
             .then(function(html, js) {
-                $(SELECTORS.CALENDAR_MONTH_WRAPPER).replaceWith(html);
-
-                return Templates.runTemplateJS(js);
+                return Templates.replaceNodeContents(SELECTORS.CALENDAR_MONTH_WRAPPER, html, js);
             })
             .done(function() {
-                $('body').trigger(CalendarEvents.monthChanged, []);
+                $('body').trigger(CalendarEvents.monthChanged, [time, courseid]);
             })
             .fail(Notification.exception);
         };

diff --git a/calendar/classes/external/day_exporter.php b/calendar/classes/external/day_exporter.php
@@ -95,7 +95,7 @@ protected static function define_other_properties() {
                 'optional' => true,
             ],
             'events' => [
-                'type' => event_exporter::read_properties_definition(),
+                'type' => calendar_event_exporter::read_properties_definition(),
                 'multiple' => true,
             ]
         ];

diff --git a/calendar/externallib.php b/calendar/externallib.php
@@ -857,8 +857,6 @@ public static function get_calendar_monthly_view($time, $courseid) {
         global $CFG, $DB, $USER, $PAGE;
         require_once($CFG->dirroot."/calendar/lib.php");
 
-        $warnings = [];
-
         // Parameter validation.
         $params = self::validate_parameters(self::get_calendar_monthly_view_parameters(), [
             'time' => $time,

diff --git a/calendar/lib.php b/calendar/lib.php
@@ -3424,7 +3424,7 @@ function calendar_get_legacy_events($tstart, $tend, $users, $groups, $courses, $
 
 
 /**
- * Get theh calendar view output.
+ * Get the calendar view output.
  *
  * @param   \calendar_information $calendar The calendar being represented
  * @param   string      $view The type of calendar to have displayed
@@ -3507,23 +3507,9 @@ function ($event) {
         'cache' => new \core_calendar\external\events_related_objects_cache($events),
     ];
 
-    if ($view === 'upcoming') {
-        $defaultlookahead = CALENDAR_DEFAULT_UPCOMING_LOOKAHEAD;
-        if (isset($CFG->calendar_lookahead)) {
-            $defaultlookahead = intval($CFG->calendar_lookahead);
-        }
-        $lookahead = get_user_preferences('calendar_lookahead', $defaultlookahead);
-
-        $defaultmaxevents = CALENDAR_DEFAULT_UPCOMING_MAXEVENTS;
-        if (isset($CFG->calendar_maxevents)) {
-            $defaultmaxevents = intval($CFG->calendar_maxevents);
-        }
-        $maxevents = get_user_preferences('calendar_maxevents', $defaultmaxevents);
-    } else {
-        $month = new \core_calendar\external\month_exporter($calendar, $type, $related);
-        $data = $month->export($renderer);
-        $template = 'core_calendar/month_detailed';
-    }
+    $month = new \core_calendar\external\month_exporter($calendar, $type, $related);
+    $data = $month->export($renderer);
+    $template = 'core_calendar/month_detailed';
 
     return [$data, $template];
 }

diff --git a/calendar/templates/month_detailed.mustache b/calendar/templates/month_detailed.mustache
@@ -34,7 +34,7 @@
 <span class="calendarwrapper" data-courseid="{{courseid}}">
     {{> core_calendar/month_header }}
     {{> core_calendar/month_navigation }}
-    <table class="calendarmonth calendartable table card-deck m-b-0">
+    <table class="calendarmonth calendartable card-deck m-b-0">
         <thead>
             <tr>
                 {{# daynames }}
@@ -79,7 +79,7 @@
                                 </ul>
                             {{/events.0}}
                         </div>
-                        <div class="hidden-md-up">
+                        <div class="hidden-md-up hidden-desktop">
                             {{#events.0}}
                                 <a href="{{viewdaylink}}" class="day" title="{{viewdaylinktitle}}">{{mday}}</a>
                             {{/events.0}}