Merge pull request phaserjs#211 from cocoademon/fix_skip_children

photonstorm · photonstorm · commit ca297318f076 · 2013-11-20T04:50:34.000-08:00
Fix a silly mistake in skip preupdate/update for PIXI objects
diff --git a/src/core/World.js b/src/core/World.js
@@ -76,18 +76,20 @@ Phaser.World.prototype.update = function () {
 	if (this.game.stage._stage.first._iNext)
 	{
 		var currentNode = this.game.stage._stage.first._iNext;
-        var skipChildren = false;
+        var skipChildren;
 		
 		do
 		{
+            skipChildren = false;
+
 			if (currentNode['preUpdate'])
 			{
-				skipChildren = (currentNode.preUpdate() == false);
+				skipChildren = (currentNode.preUpdate() === false);
 			}
 
 			if (currentNode['update'])
 			{
-				skipChildren = (currentNode.update() == false) || skipChildren;
+				skipChildren = (currentNode.update() === false) || skipChildren;
 			}
 			
             if(skipChildren)

Original file line number	Diff line number	Diff line change
`@@ -76,18 +76,20 @@ Phaser.World.prototype.update = function () {`
`76`	`76`	`if (this.game.stage._stage.first._iNext)`
`77`	`77`	`{`
`78`	`78`	`var currentNode = this.game.stage._stage.first._iNext;`
`79`		`- var skipChildren = false;`
	`79`	`+ var skipChildren;`
`80`	`80`
`81`	`81`	`do`
`82`	`82`	`{`
	`83`	`+ skipChildren = false;`
	`84`	`+`
`83`	`85`	`if (currentNode['preUpdate'])`
`84`	`86`	`{`
`85`		`- skipChildren = (currentNode.preUpdate() == false);`
	`87`	`+ skipChildren = (currentNode.preUpdate() === false);`
`86`	`88`	`}`
`87`	`89`
`88`	`90`	`if (currentNode['update'])`
`89`	`91`	`{`
`90`		`- skipChildren = (currentNode.update() == false) \|\| skipChildren;`
	`92`	`+ skipChildren = (currentNode.update() === false) \|\| skipChildren;`
`91`	`93`	`}`
`92`	`94`
`93`	`95`	`if(skipChildren)`