fix v-repeat with v-component (fix vuejs#1004)

Author: yyx990803

src/compiler/compile.js

@@ -247,7 +247,7 @@ function compileElement (el, options) {
   }
   // check component
   if (!linkFn) {
-    linkFn = checkComponent(el, options, hasAttrs)
+    linkFn = checkComponent(el, options)
   }
   // normal directives
   if (!linkFn && hasAttrs) {

src/util/misc.js

@@ -74,12 +74,11 @@ function formatValue (val) {
  *
  * @param {Element} el
  * @param {Object} options
- * @param {Boolean} hasAttrs
  * @return {String|undefined}
  */
 
 exports.commonTagRE = /^(div|p|span|img|a|br|ul|ol|li|h1|h2|h3|h4|h5|code|pre)$/
-exports.checkComponent = function (el, options, hasAttrs) {
+exports.checkComponent = function (el, options) {
   var tag = el.tagName.toLowerCase()
   if (tag === 'component') {
     // dynamic syntax
@@ -91,10 +90,9 @@ exports.checkComponent = function (el, options, hasAttrs) {
     _.resolveAsset(options, 'components', tag)
   ) {
     return tag
-  } else if (
-    hasAttrs &&
-    (tag = _.attr(el, 'component'))
-  ) {
+  /* eslint-disable no-cond-assign */
+  } else if (tag = _.attr(el, 'component')) {
+  /* eslint-enable no-cond-assign */
     return tag
   }
 }

test/unit/specs/directives/repeat_spec.js

@@ -155,6 +155,23 @@ if (_.inBrowser) {
       assertMutations(vm, el, done)
     })
 
+    it('v-component', function (done) {
+      var vm = new Vue({
+        el: el,
+        data: {
+          items: [{a: 1}, {a: 2}]
+        },
+        template: '<p v-repeat="items" v-component="test"></p>',
+        components: {
+          test: {
+            template: '<div>{{$index}} {{a}}</div>',
+            replace: true
+          }
+        }
+      })
+      assertMutations(vm, el, done)
+    })
+
     it('component with inline-template', function (done) {
       var vm = new Vue({
         el: el,
@@ -547,12 +564,9 @@ if (_.inBrowser) {
       var obj = {}
       new Vue({
         el: el,
-        template: '<div v-repeat="items" v-component="test"></div>',
+        template: '<div v-repeat="items"></div>',
         data: {
           items: [obj, obj]
-        },
-        components: {
-          test: {}
         }
       })
       expect(hasWarned(_, 'Duplicate objects')).toBe(true)
@@ -561,12 +575,9 @@ if (_.inBrowser) {
     it('warn duplicate trackby id', function () {
       new Vue({
         el: el,
-        template: '<div v-repeat="items" v-component="test" track-by="id"></div>',
+        template: '<div v-repeat="items" track-by="id"></div>',
         data: {
           items: [{id: 1}, {id: 1}]
-        },
-        components: {
-          test: {}
         }
       })
       expect(hasWarned(_, 'Duplicate track-by key')).toBe(true)
@@ -602,12 +613,9 @@ if (_.inBrowser) {
     it('teardown', function () {
       var vm = new Vue({
         el: el,
-        template: '<div v-repeat="items" v-component="test"></div>',
+        template: '<div v-repeat="items"></div>',
         data: {
           items: [{a: 1}, {a: 2}]
-        },
-        components: {
-          test: {}
         }
       })
       vm._directives[0].unbind()