only warn v-repeat on options when select has a v-model

yyx990803 · yyx990803 · commit 9942ace3ecf0 · 2015-08-27T11:02:26.000-04:00
diff --git a/src/directives/model/index.js b/src/directives/model/index.js
@@ -50,9 +50,10 @@ module.exports = {
       )
       return
     }
+    el.__v_model = this
     handler.bind.call(this)
     this.update = handler.update
-    this.unbind = handler.unbind
+    this._unbind = handler.unbind
   },
 
   /**
@@ -72,5 +73,10 @@ module.exports = {
         this.hasWrite = true
       }
     }
+  },
+
+  unbind: function () {
+    this.el.__v_model = null
+    this._unbind && this._unbind()
   }
 }
diff --git a/src/directives/repeat.js b/src/directives/repeat.js
@@ -21,6 +21,21 @@ module.exports = {
    */
 
   bind: function () {
+
+    // some helpful tips...
+    /* istanbul ignore if */
+    if (
+      process.env.NODE_ENV !== 'production' &&
+      this.el.tagName === 'OPTION' &&
+      this.el.parentNode && this.el.parentNode.__v_model
+    ) {
+      _.warn(
+        'Don\'t use v-repeat for v-model options; ' +
+        'use the `options` param instead: ' +
+        'http://vuejs.org/guide/forms.html#Dynamic_Select_Options'
+      )
+    }
+
     // support for item in array syntax
     var inMatch = this.expression.match(/(.*) in (.*)/)
     if (inMatch) {
@@ -59,19 +74,6 @@ module.exports = {
 
     // create cache object
     this.cache = Object.create(null)
-
-    // some helpful tips...
-    /* istanbul ignore if */
-    if (
-      process.env.NODE_ENV !== 'production' &&
-      this.el.tagName === 'OPTION'
-    ) {
-      _.warn(
-        'Don\'t use v-repeat for v-model options; ' +
-        'use the `options` param instead: ' +
-        'http://vuejs.org/guide/forms.html#Dynamic_Select_Options'
-      )
-    }
   },
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,10 @@ module.exports = {`
`50`	`50`	`)`
`51`	`51`	`return`
`52`	`52`	`}`
	`53`	`+ el.__v_model = this`
`53`	`54`	`handler.bind.call(this)`
`54`	`55`	`this.update = handler.update`
`55`		`- this.unbind = handler.unbind`
	`56`	`+ this._unbind = handler.unbind`
`56`	`57`	`},`
`57`	`58`
`58`	`59`	`/**`
`@@ -72,5 +73,10 @@ module.exports = {`
`72`	`73`	`this.hasWrite = true`
`73`	`74`	`}`
`74`	`75`	`}`
	`76`	`+ },`
	`77`	`+`
	`78`	`+ unbind: function () {`
	`79`	`+ this.el.__v_model = null`
	`80`	`+ this._unbind && this._unbind()`
`75`	`81`	`}`
`76`	`82`	`}`