Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
moodle
moodle
Commits
87f67ecc
Commit
87f67ecc
authored
Jul 09, 2020
by
Jake Dallimore
Browse files
Merge branch 'MDL-69135-37' of
git://github.com/andrewnicols/moodle
into MOODLE_37_STABLE
parents
0442cf99
be58ae75
Changes
2
Hide whitespace changes
Inline
Side-by-side
calendar/amd/build/calendar_filter.min.js
View file @
87f67ecc
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
calendar/amd/src/calendar_filter.js
View file @
87f67ecc
...
...
@@ -64,6 +64,7 @@ function(
// Toggle the hidden. We need to render the template before we change the value.
data
.
hidden
=
!
data
.
hidden
;
M
.
util
.
js_pending
(
"
core_calendar/calendar_filter:toggleFilter
"
);
return
Str
.
get_string
(
'
eventtype
'
+
data
.
eventtype
,
'
calendar
'
)
.
then
(
function
(
nameStr
)
{
data
.
name
=
nameStr
;
...
...
@@ -81,6 +82,7 @@ function(
})
.
then
(
function
()
{
fireFilterChangedEvent
(
data
);
M
.
util
.
js_complete
(
"
core_calendar/calendar_filter:toggleFilter
"
);
return
;
});
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment