Commitee0e8b5

HcySunYang

authored and

yyx990803

committed

refactor: tweak data merge strategy (vuejs#6833)

* tweak: The value of this is always undefined* parentVal and childVal must have a presence, otherwise the strats.data policy function will not be executed

1 parent98ea0a3 commitee0e8b5Copy full SHA for ee0e8b5

File tree

1 file changed

-2

lines changed

src/core/util
- options.js

1 file changed

-2

lines changed

`‎src/core/util/options.js`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ export function mergeDataOrFn (`
`89`	`89`	`typeofparentVal==='function' ?parentVal.call(this) :parentVal`
`90`	`90`	`)`
`91`	`91`	`}`
`92`		`-}elseif(parentVal\|\|childVal){`
	`92`	`+}else{`
`93`	`93`	`returnfunctionmergedInstanceDataFn(){`
`94`	`94`	`// instance merge`
`95`	`95`	`constinstanceData=typeofchildVal==='function'`
`@@ -123,7 +123,7 @@ strats.data = function (`
`123`	`123`
`124`	`124`	`returnparentVal`
`125`	`125`	`}`
`126`		`-returnmergeDataOrFn.call(this,parentVal,childVal)`
	`126`	`+returnmergeDataOrFn(parentVal,childVal)`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`returnmergeDataOrFn(parentVal, childVal, vm)`

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!

Commitee0e8b5

File tree

1 file changed

1 file changed

`‎src/core/util/options.js`

0 commit comments