Merge pull request #2452 from VisualSJ/develop-audio

dingpinglv · dingpinglv · commit 78ae04123535 · 2014-11-12T17:07:55.000+08:00
Fixed cc.Node._StateCallbackType is undefined
diff --git a/cocos2d/core/sprites/CCSprite.js b/cocos2d/core/sprites/CCSprite.js
@@ -546,7 +546,7 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
             }
 
             if (this._batchNode) {
-                this._arrayMakeObjectsPerformSelector(_children, cc.Node._StateCallbackType.sortAllChildren);
+                this._arrayMakeObjectsPerformSelector(_children, cc.Node._stateCallbackType.sortAllChildren);
             }
 
             //don't need to check children recursively, that's done in visit of each child
@@ -1458,7 +1458,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
 
         // recursively iterate over children
         if (_t._hasChildren)
-            _t._arrayMakeObjectsPerformSelector(_t._children, cc.Node._StateCallbackType.updateTransform);
+            _t._arrayMakeObjectsPerformSelector(_t._children, cc.Node._stateCallbackType.updateTransform);
     };
 
     _p.addChild = function (child, localZOrder, tag) {

Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,7 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{`
`546`	`546`	`}`
`547`	`547`
`548`	`548`	`if (this._batchNode) {`
`549`		`- this._arrayMakeObjectsPerformSelector(_children, cc.Node._StateCallbackType.sortAllChildren);`
	`549`	`+ this._arrayMakeObjectsPerformSelector(_children, cc.Node._stateCallbackType.sortAllChildren);`
`550`	`550`	`}`
`551`	`551`
`552`	`552`	`//don't need to check children recursively, that's done in visit of each child`
`@@ -1458,7 +1458,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {`
`1458`	`1458`
`1459`	`1459`	`// recursively iterate over children`
`1460`	`1460`	`if (_t._hasChildren)`
`1461`		`- _t._arrayMakeObjectsPerformSelector(_t._children, cc.Node._StateCallbackType.updateTransform);`
	`1461`	`+ _t._arrayMakeObjectsPerformSelector(_t._children, cc.Node._stateCallbackType.updateTransform);`
`1462`	`1462`	`};`
`1463`	`1463`
`1464`	`1464`	`_p.addChild = function (child, localZOrder, tag) {`