Merge branch 'MDL-60374-master' of git://github.com/andrewnicols/moodle

moodle · Oct 16, 2017 · 5d5ebedf565f379149061fb104906710ae7d1ddb · 5d5ebed
2 parents 2350745 + 5873e1d
commit 5d5ebedf565f379149061fb104906710ae7d1ddb
Unified Split

Showing with 20 additions and 4 deletions.

+20 −4 calendar/templates/month_detailed.mustache
diff --git a/calendar/templates/month_detailed.mustache b/calendar/templates/month_detailed.mustache
@@ -157,10 +157,26 @@ require([
        M.util.js_pending("month-detailed-{{uniqid}}-filterChanged");
        // A filter value has been changed.
        // Find all matching cells in the popover data, and hide them.
-        $("#month-detailed-{{uniqid}}")
-            .find(CalendarSelectors.eventType[data.type])
-            .toggleClass('hidden', !!data.hidden);
-        M.util.js_complete("month-detailed-{{uniqid}}-filterChanged");
+        var target = $("#month-detailed-{{uniqid}}").find(CalendarSelectors.eventType[data.type]);
+
+        var transitionPromise = $.Deferred();
+        if (data.hidden) {
+            transitionPromise.then(function() {
+                return target.slideUp('fast').promise();
+            });
+        } else {
+            transitionPromise.then(function() {
+                return target.slideDown('fast').promise();
+            });
+        }
+
+        transitionPromise.then(function() {
+            M.util.js_complete("month-detailed-{{uniqid}}-filterChanged");
+
+            return;
+        });
+
+        transitionPromise.resolve();
    });
 });
 {{/js}}