refactor v-repeat alias/meta logic

yyx990803 · yyx990803 · commit 4b20ad6ea93e · 2015-04-27T17:00:42.000-04:00
diff --git a/src/directives/repeat.js b/src/directives/repeat.js
@@ -268,20 +268,22 @@ module.exports = {
    */
 
   build: function (data, index, needCache) {
-    var original = data
     var meta = { $index: index }
     if (this.converted) {
-      meta.$key = original.$key
+      meta.$key = data.$key
     }
     var raw = this.converted ? data.$value : data
     var alias = this.arg
-    var hasAlias = !isObject(raw) || !isPlainObject(data) || alias
-    // wrap the raw data with alias
-    data = hasAlias ? {} : raw
     if (alias) {
+      data = {}
       data[alias] = raw
-    } else if (hasAlias) {
+    } else if (!isPlainObject(raw)) {
+      // non-object values
+      data = {}
       meta.$value = raw
+    } else {
+      // default
+      data = raw
     }
     // resolve constructor
     var Ctor = this.Ctor || this.resolveCtor(data, meta)
diff --git a/test/unit/specs/directives/repeat_spec.js b/test/unit/specs/directives/repeat_spec.js
@@ -256,7 +256,7 @@ if (_.inBrowser) {
           }
         },
         template: '<div v-repeat="listHash">{{$key}}' +
-            '<p v-repeat="$data">{{a}}</p>' +
+            '<p v-repeat="$value">{{a}}</p>' +
             '</div>'
       })
       function output(key){

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ if (_.inBrowser) {`
`256`	`256`	`}`
`257`	`257`	`},`
`258`	`258`	`template: '<div v-repeat="listHash">{{$key}}' +`
`259`		`- '<p v-repeat="$data">{{a}}</p>' +`
	`259`	`+ '<p v-repeat="$value">{{a}}</p>' +`
`260`	`260`	`'</div>'`
`261`	`261`	`})`
`262`	`262`	`function output(key){`