Commit53b77f8

committed

refactor: simplify mergeVNodeHook usage

1 parent664cee6 commit53b77f8Copy full SHA for 53b77f8

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,13 @@`
`1`	`1`	`/@flow /`
`2`	`2`
	`3`	`+importVNodefrom'../vnode'`
`3`	`4`	`import{createFnInvoker}from'./update-listeners'`
`4`	`5`	`import{remove,isDef,isUndef,isTrue}from'shared/util'`
`5`	`6`
`6`	`7`	`exportfunctionmergeVNodeHook(def:Object,hookKey:string,hook:Function){`
	`8`	`+if(definstanceofVNode){`
	`9`	`+def=def.data.hook\|\|(def.data.hook={})`
	`10`	`+}`
`7`	`11`	`letinvoker`
`8`	`12`	`constoldHook=def[hookKey]`
`9`	`13`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,14 +54,14 @@ function _update (oldVnode, vnode) {`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`if(isCreate){`
`57`		`-mergeVNodeHook(vnode.data.hook\|\|(vnode.data.hook={}),'insert',callInsert)`
	`57`	`+mergeVNodeHook(vnode,'insert',callInsert)`
`58`	`58`	`}else{`
`59`	`59`	`callInsert()`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`if(dirsWithPostpatch.length){`
`64`		`-mergeVNodeHook(vnode.data.hook\|\|(vnode.data.hook={}),'postpatch',()=>{`
	`64`	`+mergeVNodeHook(vnode,'postpatch',()=>{`
`65`	`65`	`for(leti=0;i<dirsWithPostpatch.length;i++){`
`66`	`66`	`callHook(dirsWithPostpatch[i],'componentUpdated',vnode,oldVnode)`
`67`	`67`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ const directive = {`
`24`	`24`	`if(vnode.tag==='select'){`
`25`	`25`	`// #6903`
`26`	`26`	`if(oldVnode.elm&&!oldVnode.elm._vOptions){`
`27`		`-mergeVNodeHook(vnode.data.hook\|\|(vnode.data.hook={}),'postpatch',()=>{`
	`27`	`+mergeVNodeHook(vnode,'postpatch',()=>{`
`28`	`28`	`directive.componentUpdated(el,binding,vnode)`
`29`	`29`	`})`
`30`	`30`	`}else{`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ export function enter (vnode: VNodeWithData, toggleDisplay: ?() => void) {`
`130`	`130`
`131`	`131`	`if(!vnode.data.show){`
`132`	`132`	`// remove pending leave element on enter by injecting an insert hook`
`133`		`-mergeVNodeHook(vnode.data.hook\|\|(vnode.data.hook={}),'insert',()=>{`
	`133`	`+mergeVNodeHook(vnode,'insert',()=>{`
`134`	`134`	`constparent=el.parentNode`
`135`	`135`	`constpendingNode=parent&&parent._pending&&parent._pending[vnode.key]`
`136`	`136`	`if(pendingNode&&`

Comments

(0)