ensure v-model runtime metadata for all types

yyx990803 · yyx990803 · commit 5d0999ac375f · 2016-10-12T15:59:14.000-04:00
diff --git a/src/platforms/web/compiler/directives/model.js b/src/platforms/web/compiler/directives/model.js
@@ -25,14 +25,16 @@ export default function model (
     }
   }
   if (tag === 'select') {
-    return genSelect(el, value)
+    genSelect(el, value)
   } else if (tag === 'input' && type === 'checkbox') {
     genCheckboxModel(el, value)
   } else if (tag === 'input' && type === 'radio') {
     genRadioModel(el, value)
   } else {
-    return genDefaultModel(el, value, modifiers)
+    genDefaultModel(el, value, modifiers)
   }
+  // ensure runtime directive metadata
+  return true
 }
 
 function genCheckboxModel (el: ASTElement, value: string) {
@@ -128,10 +130,6 @@ function genDefaultModel (
   }
   addProp(el, 'value', isNative ? `_s(${value})` : `(${value})`)
   addHandler(el, event, code, null, true)
-  if (needCompositionGuard) {
-    // need runtime directive code to help with composition events
-    return true
-  }
 }
 
 function genSelect (el: ASTElement, value: string) {
@@ -143,8 +141,6 @@ function genSelect (el: ASTElement, value: string) {
     `.map(function(o){return "_value" in o ? o._value : o.value})` +
     (el.attrsMap.multiple == null ? '[0]' : '')
   addHandler(el, 'change', code, null, true)
-  // need runtime to help with possible dynamically generated options
-  return true
 }
 
 function checkOptionWarning (option: any): boolean {
diff --git a/src/platforms/web/runtime/directives/model.js b/src/platforms/web/runtime/directives/model.js
@@ -40,7 +40,10 @@ export default {
       if (isIE || isEdge) {
         setTimeout(cb, 0)
       }
-    } else if (vnode.tag === 'textarea' || el.type === 'text') {
+    } else if (
+      (vnode.tag === 'textarea' || el.type === 'text') &&
+      !binding.modifiers.lazy
+    ) {
       if (!isAndroid) {
         el.addEventListener('compositionstart', onCompositionStart)
         el.addEventListener('compositionend', onCompositionEnd)

Original file line number	Diff line number	Diff line change
`@@ -25,14 +25,16 @@ export default function model (`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`if (tag === 'select') {`
`28`		`- return genSelect(el, value)`
	`28`	`+ genSelect(el, value)`
`29`	`29`	`} else if (tag === 'input' && type === 'checkbox') {`
`30`	`30`	`genCheckboxModel(el, value)`
`31`	`31`	`} else if (tag === 'input' && type === 'radio') {`
`32`	`32`	`genRadioModel(el, value)`
`33`	`33`	`} else {`
`34`		`- return genDefaultModel(el, value, modifiers)`
	`34`	`+ genDefaultModel(el, value, modifiers)`
`35`	`35`	`}`
	`36`	`+ // ensure runtime directive metadata`
	`37`	`+ return true`
`36`	`38`	`}`
`37`	`39`
`38`	`40`	`function genCheckboxModel (el: ASTElement, value: string) {`
`@@ -128,10 +130,6 @@ function genDefaultModel (`
`128`	`130`	`}`
`129`	`131`	addProp(el, 'value', isNative ? `_s(${value})` : `(${value})`)
`130`	`132`	`addHandler(el, event, code, null, true)`
`131`		`- if (needCompositionGuard) {`
`132`		`- // need runtime directive code to help with composition events`
`133`		`- return true`
`134`		`- }`
`135`	`133`	`}`
`136`	`134`
`137`	`135`	`function genSelect (el: ASTElement, value: string) {`
`@@ -143,8 +141,6 @@ function genSelect (el: ASTElement, value: string) {`
`143`	`141`	`.map(function(o){return "_value" in o ? o._value : o.value})` +
`144`	`142`	`(el.attrsMap.multiple == null ? '[0]' : '')`
`145`	`143`	`addHandler(el, 'change', code, null, true)`
`146`		`- // need runtime to help with possible dynamically generated options`
`147`		`- return true`
`148`	`144`	`}`
`149`	`145`
`150`	`146`	`function checkOptionWarning (option: any): boolean {`