Fix Handlebars template rendering (see bigskysoftware#801 and bigskysoftware#1801)

Author: russ4stall

src/ext/client-side-templates.js

@@ -28,15 +28,27 @@ htmx.defineExtension('client-side-templates', {
         var handlebarsTemplate = htmx.closest(elt, "[handlebars-template]");
         if (handlebarsTemplate) {
             var data = JSON.parse(text);
-            var templateName = handlebarsTemplate.getAttribute('handlebars-template');
-            return Handlebars.partials[templateName](data);
+            var templateId = handlebarsTemplate.getAttribute('handlebars-template');
+            var templateElement = htmx.find('#' + templateId).innerHTML;
+            var renderTemplate = Handlebars.compile(templateElement);
+            if (renderTemplate) {
+                return renderTemplate(data);
+            } else {
+                throw "Unknown handlebars template: " + templateId;
+            }
         }
 
         var handlebarsArrayTemplate = htmx.closest(elt, "[handlebars-array-template]");
         if (handlebarsArrayTemplate) {
             var data = JSON.parse(text);
-            var templateName = handlebarsArrayTemplate.getAttribute('handlebars-array-template');
-            return Handlebars.partials[templateName]({"data": data});
+            var templateId = handlebarsArrayTemplate.getAttribute('handlebars-array-template');
+            var templateElement = htmx.find('#' + templateId).innerHTML;
+            var renderTemplate = Handlebars.compile(templateElement);
+            if (renderTemplate) {
+                return renderTemplate(data);
+            } else {
+                throw "Unknown handlebars template: " + templateId;
+            }
         }
 
         var nunjucksTemplate = htmx.closest(elt, "[nunjucks-template]");
@@ -50,7 +62,7 @@ htmx.defineExtension('client-side-templates', {
                 return nunjucks.render(templateName, data);
             }
         }
-        
+
         var xsltTemplate = htmx.closest(elt, "[xslt-template]");
         if (xsltTemplate) {
             var templateId = xsltTemplate.getAttribute('xslt-template');

test/ext/client-side-templates.js

@@ -29,16 +29,16 @@ describe("client-side-templates extension", function() {
     it('works on basic handlebars template', function () {
         this.server.respondWith("GET", "/test", '{"foo":"bar"}');
         var btn = make('<button hx-get="/test" hx-ext="client-side-templates" handlebars-template="hb1">Click Me!</button>')
-        Handlebars.partials["hb1"] = Handlebars.compile("*{{foo}}*");
+        make('<script id="hb1" type="text/x-handlebars-template">*{{foo}}*</script>')
         btn.click();
         this.server.respond();
         btn.innerHTML.should.equal("*bar*");
     });
 
     it('works on handlebars array template', function () {
-        this.server.respondWith("GET", "/test", '{"foo":"bar"}');
+        this.server.respondWith("GET", "/test", '[{"foo":"bar"}]');
         var btn = make('<button hx-get="/test" hx-ext="client-side-templates" handlebars-array-template="hb1">Click Me!</button>')
-        Handlebars.partials["hb1"] = Handlebars.compile("*{{data.foo}}*");
+        make('<script id="hb1" type="text/x-handlebars-template">*{{#.}}{{foo}}{{/.}}*</script>')
         btn.click();
         this.server.respond();
         btn.innerHTML.should.equal("*bar*");
@@ -56,4 +56,4 @@ describe("client-side-templates extension", function() {
         this.server.respond();
         btn.innerHTML.should.equal("*bar*");
     });
-});
+});

www/content/extensions/client-side-templates.md

@@ -15,7 +15,7 @@ When you add this extension on an element, any element below it in the DOM can u
 the template the standard way for that template engine:
 
 * `mustache` - looks a mustache <script> tag up by ID for the template content
-* `handlebars` - looks in the `Handlebars.partials` collection for a template with that name
+* `handlebars` - looks a handlebars <script> tag up by ID for the template content
 * `nunjucks` - resolves the template by name via `nunjucks.render(<template-name>)
 * `xslt` - looks an XSLT &lt;script> tag up by ID for the template content