Merge pull request vuejs#719 from calebboyd/devb

yyx990803 · yyx990803 · commit f96075d38b1a · 2015-02-21T11:53:35.000-08:00
fix vuejs#717: support multiline expressions
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,6 @@ test/unit/specs.js
 explorations
 node_modules
 .DS_Store
+.idea
 benchmarks/browser.js
 coverage
diff --git a/src/parsers/expression.js b/src/parsers/expression.js
@@ -16,7 +16,7 @@ var keywords =
 
 var wsRE = /\s/g
 var newlineRE = /\n/g
-var saveRE = /[\{,]\s*[\w\$_]+\s*:|'[^']*'|"[^"]*"/g
+var saveRE = /[\{,]\s*[\w\$_]+\s*:|('[^']*'|"[^"]*")/g
 var restoreRE = /"(\d+)"/g
 var pathTestRE = /^[A-Za-z_$][\w$]*(\.[A-Za-z_$][\w$]*|\['.*?'\]|\[".*?"\]|\[\d+\])*$/
 var pathReplaceRE = /[^\w$\.]([A-Za-z_$][\w$]*(\.[A-Za-z_$][\w$]*|\['.*?'\]|\[".*?"\])*)/g
@@ -38,12 +38,15 @@ var saved = []
  * Save replacer
  *
  * @param {String} str
+ * @param {String} isString - str if matched as a string
  * @return {String} - placeholder with index
  */
 
-function save (str) {
+function save (str, isString) {
   var i = saved.length
-  saved[i] = str.replace(newlineRE, '\\n')
+  saved[i] = isString
+    ? str.replace(newlineRE, '\\n')
+    : str.replace(wsRE,'')
   return '"' + i + '"'
 }
 
diff --git a/test/unit/specs/parsers/expression_spec.js b/test/unit/specs/parsers/expression_spec.js
@@ -62,6 +62,12 @@ var testCases = [
     expected: 'inline hel\nlo',
     paths: ['a']
   },
+  {
+    //multiline expressions
+    exp: "{\n a: '35',\n b: c}",
+    scope:{c:32},
+    expected: { a : '35', b : 32 }
+  },
   {
     // dollar signs and underscore
     exp: "_a + ' ' + $b",
