Commit62405aa

committed

revert: fix(v-model): fix input listener with modifier blocking v-model update

This reverts commit6f312d6 because the changeis no longer needed after switching nextTick to use MessageChannel.

1 parent405d8e9 commit62405aaCopy full SHA for 62405aa

File tree

2 files changed

-29

lines changed

src/core/vdom/helpers
- update-listeners.js
test/unit/features/directives
- model-text.spec.js

2 files changed

-29

lines changed

`‎src/core/vdom/helpers/update-listeners.js‎`

Lines changed: 2 additions & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,22 +5,18 @@ import { cached, isUndef } from 'shared/util'`
`5`	`5`
`6`	`6`	`constnormalizeEvent=cached((name:string):{`
`7`	`7`	`name:string,`
`8`		`-plain:boolean,`
`9`	`8`	`once:boolean,`
`10`	`9`	`capture:boolean,`
`11`		`-passive:boolean,`
`12`		`-handler?:Function`
	`10`	`+passive:boolean`
`13`	`11`	`}=>{`
`14`	`12`	`const passive=name.charAt(0)==='&'`
`15`	`13`	`name=passive ?name.slice(1) :name`
`16`	`14`	`constonce=name.charAt(0)==='~'// Prefixed last, checked first`
`17`	`15`	`name=once ?name.slice(1) :name`
`18`	`16`	`constcapture=name.charAt(0)==='!'`
`19`	`17`	`name=capture ?name.slice(1) :name`
`20`		`-constplain=!(passive\|\|once\|\|capture)`
`21`	`18`	`return{`
`22`	`19`	`name,`
`23`		`- plain,`
`24`	`20`	`once,`
`25`	`21`	`capture,`
`26`	`22`	`passive`
`@@ -44,11 +40,6 @@ export function createFnInvoker (fns: Function \| Array<Function>): Function {`
`44`	`40`	`returninvoker`
`45`	`41`	`}`
`46`	`42`
`47`		`-// #6552`
`48`		`-functionprioritizePlainEvents(a,b){`
`49`		`-returna.plain ?-1 :b.plain ?1 :0`
`50`		`-}`
`51`		`-`
`52`	`43`	`exportfunctionupdateListeners(`
`53`	`44`	`on:Object,`
`54`	`45`	`oldOn:Object,`
`@@ -57,13 +48,10 @@ export function updateListeners (`
`57`	`48`	`vm:Component`
`58`	`49`	`){`
`59`	`50`	`letname,cur,old,event`
`60`		`-consttoAdd=[]`
`61`		`-lethasModifier=false`
`62`	`51`	`for(nameinon){`
`63`	`52`	`cur=on[name]`
`64`	`53`	`old=oldOn[name]`
`65`	`54`	`event=normalizeEvent(name)`
`66`		`-if(!event.plain)hasModifier=true`
`67`	`55`	`if(isUndef(cur)){`
`68`	`56`	`process.env.NODE_ENV!=='production'&&warn(`
`69`	`57`	`Invalid handler for event "${event.name}": got `+String(cur),
`@@ -73,20 +61,12 @@ export function updateListeners (`
`73`	`61`	`if(isUndef(cur.fns)){`
`74`	`62`	`cur=on[name]=createFnInvoker(cur)`
`75`	`63`	`}`
`76`		`-event.handler=cur`
`77`		`-toAdd.push(event)`
	`64`	`+add(event.name,cur,event.once,event.capture,event.passive)`
`78`	`65`	`}elseif(cur!==old){`
`79`	`66`	`old.fns=cur`
`80`	`67`	`on[name]=old`
`81`	`68`	`}`
`82`	`69`	`}`
`83`		`-if(toAdd.length){`
`84`		`-if(hasModifier)toAdd.sort(prioritizePlainEvents)`
`85`		`-for(leti=0;i<toAdd.length;i++){`
`86`		`-constevent=toAdd[i]`
`87`		`-add(event.name,event.handler,event.once,event.capture,event.passive)`
`88`		`-}`
`89`		`-}`
`90`	`70`	`for(nameinoldOn){`
`91`	`71`	`if(isUndef(on[name])){`
`92`	`72`	`event=normalizeEvent(name)`

`‎test/unit/features/directives/model-text.spec.js‎`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -315,13 +315,8 @@ describe('Directive v-model text', () => {`
`315`	`315`	`})`
`316`	`316`
`317`	`317`	`// #6552`
`318`		`-// Root cause: input listeners with modifiers are added as a separate`
`319`		`-// DOM listener. If a change is triggered inside this listener, an update`
`320`		`-// will happen before the second listener is fired! (obviously microtasks`
`321`		`-// can be processed in between DOM events on the same element)`
`322`		`-// This causes the domProps module to receive state that has not been`
`323`		`-// updated by v-model yet (because v-model's listener has not fired yet)`
`324`		`-// Solution: make sure to always fire v-model's listener first`
	`318`	`+// This was original introduced due to the microtask between DOM events issue`
	`319`	`+// but fixed after switching to MessageChannel.`
`325`	`320`	`it('should not block input when another input listener with modifier is used',done=>{`
`326`	`321`	`constvm=newVue({`
`327`	`322`	`data:{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit62405aa

File tree

2 files changed

2 files changed

`‎src/core/vdom/helpers/update-listeners.js‎`

`‎test/unit/features/directives/model-text.spec.js‎`

0 commit comments