split multiple expressions by unquoted commas

Author: yyx990803

src/compiler.js

@@ -276,7 +276,7 @@ CompilerProto.compileNode = function (node) {
         while (i--) {
             attr = attrs[i]
             valid = false
-            exps = attr.value.split(',')
+            exps = Directive.split(attr.value)
             // loop through clauses (separated by ",")
             // inside each attribute
             j = exps.length

src/directive.js

@@ -4,6 +4,8 @@ var config     = require('./config'),
     filters    = require('./filters'),
 
     // Regexes!
+    // regex to split multiple directive expressions
+    SPLIT_RE        = /(?:['"](?:\\.|[^'"])*['"]|\\.|[^,])+/g,
     KEY_RE          = /^[^\|]+/,
     ARG_RE          = /([^:]+):(.+)$/,
     FILTERS_RE      = /\|[^\|]+/g,
@@ -193,6 +195,16 @@ DirProto.unbind = function (update) {
     if (!update) this.vm = this.el = this.binding = this.compiler = null
 }
 
+// exposed methods ------------------------------------------------------------
+
+/**
+ *  split a unquoted-comma separated expression into
+ *  multiple clauses
+ */
+Directive.split = function (exp) {
+    return exp.match(SPLIT_RE) || ['']
+}
+
 /**
  *  make sure the directive and expression is valid
  *  before we create an instance

test/unit/specs/directive.js

@@ -11,6 +11,68 @@ describe('UNIT: Directive', function () {
         }
     }
 
+    describe('.split()', function () {
+        
+        it('should return array with one empty string for empty string', function () {
+            var e = Directive.split('')
+            assert.strictEqual(e.length, 1)
+            assert.strictEqual(e[0], '')
+        })
+
+        it('should return array with the string if it\'s a single clause', function () {
+            var e,
+                test1 = 'fsef',
+                test2 = 'ffsef + "fse,fsef"',
+                test3 = 'fsef + \'fesfsfe\'',
+                test4 = '\"fsefsf,fsef,fsef\"'
+
+            e = Directive.split(test1)
+            assert.strictEqual(e.length, 1)
+            assert.strictEqual(e[0], test1)
+
+            e = Directive.split(test2)
+            assert.strictEqual(e.length, 1)
+            assert.strictEqual(e[0], test2)
+
+            e = Directive.split(test3)
+            assert.strictEqual(e.length, 1)
+            assert.strictEqual(e[0], test3)
+
+            e = Directive.split(test4)
+            assert.strictEqual(e.length, 1)
+            assert.strictEqual(e[0], test4)
+        })
+
+        it('should return split multiple clauses correctly', function () {
+            var e,
+                test1 = ['fsef', 'fsf:fsefsef'],
+                test2 = ['asf-fsef:fsf', '"efs,sefsf"'],
+                test3 = ['\'fsef,sef\'', 'fse:fsf'],
+                test4 = ['\"fsef,fsef\"', 'sefsef\'fesfsf']
+
+            e = Directive.split(test1.join(','))
+            assert.strictEqual(e.length, 2)
+            assert.strictEqual(e[0], test1[0])
+            assert.strictEqual(e[1], test1[1])
+
+            e = Directive.split(test2.join(','))
+            assert.strictEqual(e.length, 2)
+            assert.strictEqual(e[0], test2[0])
+            assert.strictEqual(e[1], test2[1])
+
+            e = Directive.split(test3.join(','))
+            assert.strictEqual(e.length, 2)
+            assert.strictEqual(e[0], test3[0])
+            assert.strictEqual(e[1], test3[1])
+
+            e = Directive.split(test4.join(','))
+            assert.strictEqual(e.length, 2)
+            assert.strictEqual(e[0], test4[0])
+            assert.strictEqual(e[1], test4[1])
+        })
+
+    })
+
     describe('.parse()', function () {
 
         it('should return undefined if directive name does not have correct prefix', function () {