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
4b7ad884
Commit
4b7ad884
authored
Oct 19, 2018
by
Andrew Nicols
Browse files
MDL-63714 core: Wrap doRender in pendingjs
parent
dc39d0cf
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/amd/build/templates.min.js
View file @
4b7ad884
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
lib/amd/src/templates.js
View file @
4b7ad884
...
...
@@ -509,6 +509,7 @@ define(['core/mustache',
this
.
currentThemeName
=
themeName
;
var
iconTemplate
=
iconSystem
.
getTemplateName
();
M
.
util
.
js_pending
(
'
core/templates:doRender
'
);
return
this
.
getTemplate
(
iconTemplate
).
then
(
function
()
{
this
.
addHelpers
(
context
,
themeName
);
var
result
=
mustache
.
render
(
templateSource
,
context
,
this
.
partialHelper
.
bind
(
this
));
...
...
@@ -553,7 +554,11 @@ define(['core/mustache',
}
return
$
.
Deferred
().
resolve
(
html
,
js
).
promise
();
}.
bind
(
this
));
}.
bind
(
this
))
.
then
(
function
(
html
,
js
)
{
M
.
util
.
js_complete
(
'
core/templates:doRender
'
);
return
$
.
Deferred
().
resolve
(
html
,
js
).
promise
();
});
};
/**
...
...
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