Switch the order of precompiling and registering partials in handleba…

…rs tag, so that partials can used compiled template
mjumbewu · Sep 23, 2013 · 65a8d0a · 65a8d0a
1 parent 91a25da
commit 65a8d0a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/jstemplate/templatetags/handlebarsjs.py b/jstemplate/templatetags/handlebarsjs.py
@@ -22,15 +22,17 @@ def generate_node_text(self, resolved_name, file_content):
             output += (
                 '<script>'
                     '(function(H) {{'
-                        'var source = document.getElementById("{name}").innerHtml;'
+                        'var source = document.getElementById("{name}").innerHtml,'
+                            'template = source;'
             )
 
-            if 'register_partials' in self.args:
-                output += 'H.registerPartial("{name}", source);'
-
             if 'precompile' in self.args:
-                output += ('H.templates = H.templates || {{}};'
-                           'H.templates["{name}"] = H.compile(source);')
+                output += ('template = H.compile(source);'
+                           'H.templates = H.templates || {{}};'
+                           'H.templates["{name}"] = template;')
+
+            if 'register_partials' in self.args:
+                output += 'H.registerPartial("{name}", template);'
 
             output += (
                     '}})(Handlebars);'

diff --git a/jstemplate/tests/test_ttag.py b/jstemplate/tests/test_ttag.py
@@ -256,9 +256,11 @@ def test_with_precompile(self):
             res,
              '<script type="text/x-handlebars-template" id="testtemplate">'
              '<p>Mustache\'s template full of {{ foo }} and \\.</p>\n'
-             '</script><script>(function(H) {var source = document.getElementById("testtemplate").innerHtml;'
+             '</script><script>(function(H) {var source = document.getElementById("testtemplate").innerHtml,'
+             'template = source;'
+             'template = H.compile(source);'
              'H.templates = H.templates || {};'
-             'H.templates["testtemplate"] = H.compile(source);})(Handlebars);</script>')
+             'H.templates["testtemplate"] = template;})(Handlebars);</script>')
 
 
     @override_settings(JSTEMPLATE_DIRS=[DIR])
@@ -271,8 +273,9 @@ def test_with_partials(self):
             res,
              '<script type="text/x-handlebars-template" id="testtemplate">'
              '<p>Mustache\'s template full of {{ foo }} and \\.</p>\n'
-             '</script><script>(function(H) {var source = document.getElementById("testtemplate").innerHtml;'
-             'H.registerPartial("testtemplate", source);})(Handlebars);</script>')
+             '</script><script>(function(H) {var source = document.getElementById("testtemplate").innerHtml,'
+             'template = source;'
+             'H.registerPartial("testtemplate", template);})(Handlebars);</script>')
 
 
 class DustTemplateTagTest(TestCase, BaseJSTemplateTagTestMixin):