From 832e55d0338426f73fc04fa4ef3b4eabdd25629c Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Wed, 9 Dec 2015 15:27:34 +0800 Subject: [PATCH] update fireball-x/fireball#433: Shielding original cc.Node and cc.Scene --- cocos2d/core/components/CCComponent.js | 1 - extensions/ccui/base-classes/CCProtectedNode.js | 2 +- predefine.js | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos2d/core/components/CCComponent.js b/cocos2d/core/components/CCComponent.js index 82aae848b6..4a997f13a4 100644 --- a/cocos2d/core/components/CCComponent.js +++ b/cocos2d/core/components/CCComponent.js @@ -185,7 +185,6 @@ var Component = cc.Class({ /** * The node this component is attached to. A component is always attached to a node. * @property node - * * @type {ENode} */ node: { diff --git a/extensions/ccui/base-classes/CCProtectedNode.js b/extensions/ccui/base-classes/CCProtectedNode.js index 09967df2b7..bcc046a1da 100644 --- a/extensions/ccui/base-classes/CCProtectedNode.js +++ b/extensions/ccui/base-classes/CCProtectedNode.js @@ -232,7 +232,7 @@ cc.ProtectedNode = _ccsg.Node.extend(/** @lends cc.ProtectedNode# */{ */ cleanup: function(){ _ccsg.Node.prototype.cleanup.call(this); - var locChildren = this._protectedChildren; + var locChildren = this._protectedChildren; for(var i = 0 , len = locChildren.length; i < len; i++) locChildren[i].cleanup(); }, diff --git a/predefine.js b/predefine.js index 603cb69702..4293c85370 100644 --- a/predefine.js +++ b/predefine.js @@ -31,6 +31,7 @@ cc = {}; +// The namespace for original nodes rendering in scene graph. _ccsg = {}; //to make sure the cc.log, cc.warn, cc.error, cc._throw and cc.assert would not throw error before init by debugger mode.