From 4b7ad8845caade2a6a53dc872e31d836e23a6d7b Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 19 Oct 2018 15:13:37 +0800
Subject: [PATCH] MDL-63714 core: Wrap doRender in pendingjs

---
 lib/amd/build/templates.min.js | Bin 6923 -> 7078 bytes
 lib/amd/src/templates.js       |   7 ++++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/amd/build/templates.min.js b/lib/amd/build/templates.min.js
index f85887e767df3e6acac6582d645fdc752856e93e..7df3db35413f7fe071466cc91985324486021bae 100644
GIT binary patch
delta 120
zcmeA+TV}rDC%>+*UTH~Yj$T%Ad_ihnN@iZVhEj5VQL27PYHmSJVo7STRZ4ykP$soV
qNmFO@PySZs$^ESSllKVl=peKv=K~d|mZaj=J6TXjZF8+~A3FfCvn(M1

delta 17
YcmZ2x-fgzwC;w(OfmY_tk|MqA06?k+JOBUy

diff --git a/lib/amd/src/templates.js b/lib/amd/src/templates.js
index dd49428a328..21fbed0560e 100644
--- a/lib/amd/src/templates.js
+++ b/lib/amd/src/templates.js
@@ -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();
+        });
     };
 
     /**
-- 
2.17.1