Merge pull request #455 from senorcris/bug/dotkey

Allow variable tokens to start with `$`
paularmstrong · May 7, 2014 · 9b75436 · 9b75436
2 parents 3855260 + c0a2c2f
commit 9b75436
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/lexer.js b/lib/lexer.js
@@ -187,7 +187,7 @@ var TYPES = {
     {
       type: TYPES.VAR,
       regex: [
-        /^[a-zA-Z_$]\w*((\.\w*)+)?/,
+        /^[a-zA-Z_$]\w*((\.\$?\w*)+)?/,
         /^[a-zA-Z_$]\w*/
       ]
     },

diff --git a/tests/variables.test.js b/tests/variables.test.js
@@ -41,7 +41,8 @@ var cases = {
     { c: '{{ o.foo() }}', e: 'bar'},
     { c: '{{ o2.foo() }}', e: 'bar'},
     { c: '{{ o2.foo("foobar") }}', e: 'foobar'},
-    { c: '{{ o2.bar }}', e: ''}
+    { c: '{{ o2.bar }}', e: ''},
+    { c: '{{ o2.$bar }}', e: 'bar'}
   ],
   'can include arrays': [
     { c: '{{ [0, 1, 3] }}', e: '0,1,3' }
@@ -94,7 +95,7 @@ describe('Variables', function () {
     i: 'foo',
     n: null,
     o: Object.create({ foo: function () { return 'bar'; } }),
-    o2: { a: 'bar', foo: function (b) { return b || this.a; } },
+    o2: { a: 'bar', foo: function (b) { return b || this.a; }, $bar: 'bar' },
     o3: { n: null }
   }};
   _.each(cases, function (cases, description) {