Merge branch 'MDL-59015-35' of git://github.com/mihailges/moodle into…

… MOODLE_35_STABLE
moodle · Aug 13, 2018 · e87bbfb · e87bbfb
2 parents 094730c + 76f2ed9
commit e87bbfb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/blocks/myoverview/amd/build/event_list.min.js b/blocks/myoverview/amd/build/event_list.min.js
diff --git a/blocks/myoverview/amd/src/event_list.js b/blocks/myoverview/amd/src/event_list.js
@@ -101,6 +101,8 @@ define(['jquery', 'core/notification', 'core/templates',
         if (!hasLoadedAll(root)) {
             // Only enable the button if we've got more events to load.
             viewMoreButton.prop('disabled', false);
+        } else {
+            viewMoreButton.addClass('hidden');
         }
     };
 

diff --git a/blocks/myoverview/templates/timeline-view-courses.mustache b/blocks/myoverview/templates/timeline-view-courses.mustache
@@ -86,7 +86,7 @@
             // If there was only one hidden block then we have no more to show now
             // so we can disable the button.
             if (blocks && blocks.length == 1) {
-                button.prop('disabled', true);
+                button.addClass('hidden');
             }
 
             if (data) {