Support switch statements inside templates.

apipkin · Oct 2, 2012 · 6b97684 · 6b97684
1 parent 7d9b214
commit 6b97684
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/src/template/js/template-micro.js b/src/template/js/template-micro.js
@@ -125,15 +125,18 @@ Micro.compile = function (text, options) {
         })
 
         .replace(options.code, function (match, code) {
-            return tokenOpen + (blocks.push("';\n" + code + "\n;$t+='") - 1) + tokenClose;
+            return tokenOpen + (blocks.push("';\n" + code + "\n$t+='") - 1) + tokenClose;
         })
 
         .replace(options.stringEscape, "\\$&")
 
         // Replace the token placeholders with code.
         .replace(/\ufffe(\d+)\uffff/g, function (match, index) {
             return blocks[parseInt(index, 10)];
-        }) +
+        })
+
+        // Remove noop string concatenations that have been left behind.
+        .replace(/\n\$t\+='';\n/g, '\n') +
 
         "';\nreturn $t;";
 

diff --git a/src/template/tests/unit/assets/template-test.js b/src/template/tests/unit/assets/template-test.js
@@ -84,6 +84,30 @@ microSuite.add(new Y.Test.Case({
         Assert.areSame('', compiled({display: false}));
     },
 
+    '<% ... %> should support switch statements': function () {
+        var compiled = Micro.compile(
+            'test' +
+            '<% switch (data.foo) { %>' +
+                '<% case "a": %>' +
+                    'a' +
+                    '<% break; %>' +
+
+                '<% case "b": %>' +
+                    'b' +
+                    '<% break; %>' +
+
+                '<% case "c": %>' +
+                    'c' +
+                    '<% break; %>' +
+            '<% } %>' +
+            'test'
+        );
+
+        Assert.areSame('testatest', compiled({foo: 'a'}));
+        Assert.areSame('testbtest', compiled({foo: 'b'}));
+        Assert.areSame('testctest', compiled({foo: 'c'}));
+    },
+
     '<%= ... %> should be rendered as HTML-escaped output': function () {
         Assert.areSame('at&amp;t', Micro.render('<%= data.name %>', {name: 'at&t'}));
     },