Merge pull request #1057 from xingsenma/sortAllChildren

dingpinglv · dingpinglv · commit 448af35fb555 · 2013-08-04T20:48:43.000-07:00
Fixed #2445 Fixed bug for sortAllChildren ,that tempChild is a changing Var
diff --git a/cocos2d/base_nodes/CCNode.js b/cocos2d/base_nodes/CCNode.js
@@ -1193,6 +1193,7 @@ cc.NodeWebGL = cc.Class.extend(/** @lends cc.NodeWebGL# */{
                 //continue moving element downwards while zOrder is smaller or when zOrder is the same but mutatedIndex is smaller
                 while (j >= 0 && ( tempItem._zOrder < tempChild._zOrder ||
                     ( tempItem._zOrder == tempChild._zOrder && tempItem._orderOfArrival < tempChild._orderOfArrival ))) {
+                    tempChild =  _children[j];
                     _children[j + 1] = tempChild;
                     j = j - 1;
                 }

Original file line number	Diff line number	Diff line change
`@@ -1193,6 +1193,7 @@ cc.NodeWebGL = cc.Class.extend(/** @lends cc.NodeWebGL# */{`
`1193`	`1193`	`//continue moving element downwards while zOrder is smaller or when zOrder is the same but mutatedIndex is smaller`
`1194`	`1194`	`while (j >= 0 && ( tempItem._zOrder < tempChild._zOrder \|\|`
`1195`	`1195`	`( tempItem._zOrder == tempChild._zOrder && tempItem._orderOfArrival < tempChild._orderOfArrival ))) {`
	`1196`	`+ tempChild = _children[j];`
`1196`	`1197`	`_children[j + 1] = tempChild;`
`1197`	`1198`	`j = j - 1;`
`1198`	`1199`	`}`