Merge branch 'MDL-72275-311-2' of git://github.com/mickhawkins/moodle…

… into MOODLE_311_STABLE
moodle · Sep 30, 2021 · 250524c · 250524c
2 parents 954bc8e + 5b6f956
commit 250524c
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 12 deletions.
diff --git a/blocks/timeline/amd/build/view_dates.min.js b/blocks/timeline/amd/build/view_dates.min.js
diff --git a/blocks/timeline/amd/build/view_dates.min.js.map b/blocks/timeline/amd/build/view_dates.min.js.map
diff --git a/blocks/timeline/amd/src/view_dates.js b/blocks/timeline/amd/src/view_dates.js
@@ -118,7 +118,7 @@ function(
         root = $(root);
         if (root.hasClass('active')) {
             load(root);
-            root.data('seen', true);
+            root.attr('data-seen', true);
         }
     };
 
@@ -132,7 +132,7 @@ function(
         root.removeAttr('data-seen');
         if (root.hasClass('active')) {
             load(root);
-            root.data('seen', true);
+            root.attr('data-seen', true);
         }
     };
 
@@ -142,9 +142,9 @@ function(
      * @param {object} root The root element for the timeline courses view.
      */
     var shown = function(root) {
-        if (!root.data('seen')) {
+        if (!root.attr('data-seen')) {
             load(root);
-            root.data('seen', true);
+            root.attr('data-seen', true);
         }
     };
 

diff --git a/blocks/timeline/classes/output/main.php b/blocks/timeline/classes/output/main.php
@@ -102,7 +102,7 @@ protected function get_filters_as_booleans() {
      */
     private function get_filter_offsets() {
 
-        $limit = false;
+        $limit = '';
         if (in_array($this->filter, [BLOCK_TIMELINE_FILTER_BY_NONE, BLOCK_TIMELINE_FILTER_BY_OVERDUE])) {
             $offset = -14;
             if ($this->filter == BLOCK_TIMELINE_FILTER_BY_OVERDUE) {
@@ -170,8 +170,8 @@ public function export_for_template(renderer_base $output) {
             'sorttimelinecourses' => $this->order == BLOCK_TIMELINE_SORT_BY_COURSES,
             'selectedfilter' => $this->filter,
             'hasdaysoffset' => true,
-            'hasdayslimit' => $offsets['dayslimit'] !== false ,
-            'nodayslimit' => $offsets['dayslimit'] === false ,
+            'hasdayslimit' => $offsets['dayslimit'] !== '' ,
+            'nodayslimit' => $offsets['dayslimit'] === '' ,
             'limit' => $this->limit
         ];
         return array_merge($contextvariables, $filters, $offsets);

diff --git a/blocks/timeline/templates/nav-day-filter.mustache b/blocks/timeline/templates/nav-day-filter.mustache
@@ -98,7 +98,7 @@
             {{#str}} next3months, block_timeline {{/str}}
         </a>
         <a
-            class="dropdown-item {{#next6months}} active {{/next6months}}"
+            class="dropdown-item"
             href="#"
             data-from="0"
             data-to="180"

diff --git a/blocks/timeline/templates/view.mustache b/blocks/timeline/templates/view.mustache
@@ -58,7 +58,7 @@
             data-limit="2"
             data-offset="0"
             data-days-limit="{{dayslimit}}"
-            data-days-offset="0"
+            data-days-offset="{{daysoffset}}"
             data-no-events-url="{{urls.noevents}}"
             id="view_courses_{{uniqid}}"
         >