Merge pull request phaserjs#4087 from TadejZupancic/patch-1

photonstorm · web-flow · commit e53a0a1de201 · 2019-04-08T12:13:27.000+01:00
Tween inside Timeline fix
diff --git a/src/tweens/tween/Tween.js b/src/tweens/tween/Tween.js
@@ -944,8 +944,16 @@ var Tween = new Class({
         {
             if (this.state === TWEEN_CONST.PAUSED || this.state === TWEEN_CONST.PENDING_ADD)
             {
-                this.parent._destroy.push(this);
-                this.parent._toProcess++;
+                if (this.parentIsTimeline)
+                {
+                    this.parent.manager._destroy.push(this);
+                    this.parent.manager._toProcess++;
+                }
+                else
+                {
+                    this.parent._destroy.push(this);
+                    this.parent._toProcess++;
+                }
             }
 
             this.state = TWEEN_CONST.PENDING_REMOVE;

Original file line number	Diff line number	Diff line change
`@@ -944,8 +944,16 @@ var Tween = new Class({`
`944`	`944`	`{`
`945`	`945`	`if (this.state === TWEEN_CONST.PAUSED \|\| this.state === TWEEN_CONST.PENDING_ADD)`
`946`	`946`	`{`
`947`		`- this.parent._destroy.push(this);`
`948`		`- this.parent._toProcess++;`
	`947`	`+ if (this.parentIsTimeline)`
	`948`	`+ {`
	`949`	`+ this.parent.manager._destroy.push(this);`
	`950`	`+ this.parent.manager._toProcess++;`
	`951`	`+ }`
	`952`	`+ else`
	`953`	`+ {`
	`954`	`+ this.parent._destroy.push(this);`
	`955`	`+ this.parent._toProcess++;`
	`956`	`+ }`
`949`	`957`	`}`
`950`	`958`
`951`	`959`	`this.state = TWEEN_CONST.PENDING_REMOVE;`