Commit0d62bb8

authored and

committed

fix: actually disable dep collection when invoking lifecycle hooks (vuejs#9095)

1 parentb0ccb86 commit0d62bb8Copy full SHA for 0d62bb8

File tree

+26

-4

lines changed

+26

-4

lines changed

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,12 @@ export default class Dep {`
`55`	`55`	`Dep.target=null`
`56`	`56`	`consttargetStack=[]`
`57`	`57`
`58`		`-exportfunctionpushTarget(_target: ?Watcher){`
`59`		`-if(Dep.target)targetStack.push(Dep.target)`
`60`		`-Dep.target=_target`
	`58`	`+exportfunctionpushTarget(target: ?Watcher){`
	`59`	`+targetStack.push(target)`
	`60`	`+Dep.target=target`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`exportfunctionpopTarget(){`
`64`		`-Dep.target=targetStack.pop()`
	`64`	`+targetStack.pop()`
	`65`	`+Dep.target=targetStack[targetStack.length-1]`
`65`	`66`	`}`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`importVuefrom'vue'`
	`2`	`+importDepfrom'core/observer/dep'`
`2`	`3`
`3`	`4`	`describe('Instance methods lifecycle',()=>{`
`4`	`5`	`describe('$mount',()=>{`
`@@ -32,6 +33,26 @@ describe('Instance methods lifecycle', () => {`
`32`	`33`	`expect(vm.$el.tagName).toBe('DIV')`
`33`	`34`	`expect(vm.$el.textContent).toBe('hi')`
`34`	`35`	`})`
	`36`	`+`
	`37`	`+it('Dep.target should be undefined in lifecycle',()=>{`
	`38`	`+constvm=newVue({`
	`39`	`+template:'<div><my-component></my-component></div>',`
	`40`	`+components:{`
	`41`	`+myComponent:{`
	`42`	`+template:'<div>hi</div>',`
	`43`	`+mounted(){`
	`44`	`+const_msg=this.msg`
	`45`	`+expect(Dep.target).toBe(undefined)`
	`46`	`+},`
	`47`	`+computed:{`
	`48`	`+msg(){`
	`49`	`+return1`
	`50`	`+}`
	`51`	`+}`
	`52`	`+}`
	`53`	`+}`
	`54`	`+}).$mount()`
	`55`	`+})`
`35`	`56`	`})`
`36`	`57`
`37`	`58`	`describe('$destroy',()=>{`

Comments

(0)