Merge pull request #26 from jwellner/fix-comments

Fixes issue #25 where open/close comment tags where not matched correctly
umakantp · Jan 10, 2018 · 3a079ce · 3a079ce
2 parents f22a859 + 53b2f36
commit 3a079ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/parser/parser.js b/src/parser/parser.js
@@ -659,7 +659,7 @@ define(['../util/objectmerge', '../util/trimallquotes', '../util/evalstring', '.
       var rdelim = new RegExp('\\*' + this.rdelim)
       var newTpl = ''
 
-      for (var openTag = tpl.match(ldelim); openTag; openTag = tpl.match(rdelim)) {
+      for (var openTag = tpl.match(ldelim); openTag; openTag = tpl.match(ldelim)) {
         newTpl += tpl.slice(0, openTag.index)
         tpl = tpl.slice(openTag.index + openTag[0].length)
         var closeTag = tpl.match(rdelim)

diff --git a/test/basic-spec.js b/test/basic-spec.js
@@ -39,6 +39,11 @@ define(['jSmart', 'text!./templates/var.tpl', 'text!./output/var.tpl'], function
       expect(t.fetch()).toBe('Testing , does it work?')
     })
 
+    it('test comments', function () {
+      var t = new jSmart('Testing {* testing *}, does it {* multiple comments *}work?')
+      expect(t.fetch()).toBe('Testing , does it work?')
+    })
+
     it('test assigning variable', function () {
       var t = new jSmart("{$foo = 'bar'} print foo {$foo}")
       expect(t.fetch()).toBe(' print foo bar')