fix vuejs#242 expressions with object literals

Evan You · Evan You · commit e422d9594523 · 2014-04-16T11:25:59.000-04:00
diff --git a/src/exp-parser.js b/src/exp-parser.js
@@ -23,7 +23,7 @@ var KEYWORDS =
         ',Math',
         
     KEYWORDS_RE = new RegExp(["\\b" + KEYWORDS.replace(/,/g, '\\b|\\b') + "\\b"].join('|'), 'g'),
-    REMOVE_RE   = /\/\*(?:.|\n)*?\*\/|\/\/[^\n]*\n|\/\/[^\n]*$|'[^']*'|"[^"]*"|[\s\t\n]*\.[\s\t\n]*[$\w\.]+/g,
+    REMOVE_RE   = /\/\*(?:.|\n)*?\*\/|\/\/[^\n]*\n|\/\/[^\n]*$|'[^']*'|"[^"]*"|[\s\t\n]*\.[\s\t\n]*[$\w\.]+|[\{,]\s*[\w\$_]+\s*:/g,
     SPLIT_RE    = /[^\w$]+/g,
     NUMBER_RE   = /\b\d[^,]*/g,
     BOUNDARY_RE = /^,+|,+$/g
diff --git a/test/unit/specs/exp-parser.js b/test/unit/specs/exp-parser.js
@@ -82,6 +82,16 @@ describe('Expression Parser', function () {
                 hi: 2
             },
             expectedValue: '"test"1\'hi\'2'
+        },
+        {
+            // expressions with inline object literals
+            exp: "sortRows({ column: 'name', test: 'haha', durrr: 123 })",
+            vm: {
+                sortRows: function (params) {
+                    return params.column + params.durrr
+                }
+            },
+            expectedValue: 'name123'
         }
     ]
 
