MDL-58760 templates: Make {{#pix}} helper work with escaped icon key

There is a difference between how our PHP mustache engine and JS mustache engine escaping works. If the icon key is not hard-coded in the template but defined as a context variable, the JS mustache engine escapes the forward slashes.
robjoyce · Apr 28, 2017 · 74e238f · 74e238f
1 parent 5ccddd2
commit 74e238f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/amd/build/templates.min.js b/lib/amd/build/templates.min.js
diff --git a/lib/amd/src/templates.js b/lib/amd/src/templates.js
@@ -212,6 +212,10 @@ define(['core/mustache',
         var searchKey = this.currentThemeName + '/' + templateName;
         var template = templateCache[searchKey];
 
+        // The key might have been escaped by the JS Mustache engine which
+        // converts forward slashes to HTML entities. Let us undo that here.
+        key = key.replace(/&#x2F;/gi, '/');
+
         return iconSystem.renderIcon(key, component, text, template);
     };