Skip to content

Commit

Permalink
Merge branch 'MDL-59015-master' of git://github.com/mihailges/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
David Monllao committed Aug 13, 2018
2 parents 66be962 + 4e829d2 commit 93e0b15
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion blocks/myoverview/amd/build/event_list.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions blocks/myoverview/amd/src/event_list.js
Expand Up @@ -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');
}
};

Expand Down
2 changes: 1 addition & 1 deletion blocks/myoverview/templates/timeline-view-courses.mustache
Expand Up @@ -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) {
Expand Down

0 comments on commit 93e0b15

Please sign in to comment.