diff --git a/cocos2d/core/sprites/CCSpriteFrame.js b/cocos2d/core/sprites/CCSpriteFrame.js index 36decbd647..603d459ce4 100644 --- a/cocos2d/core/sprites/CCSpriteFrame.js +++ b/cocos2d/core/sprites/CCSpriteFrame.js @@ -565,7 +565,7 @@ proto.copy = proto.clone; * The originalSize is the size in pixels of the frame before being trimmed. *

* since v3.0, please use new constructor {{#crossLink "SpriteFrame/SpriteFrame:method"}}SpriteFrame(){{/crossLink}} instead. - * @method cc.SpriteFrame.create + * @method create * @param {String|cc.Texture2D} filename * @param {cc.Rect} rect if parameters' length equal 2, rect in points, else rect in pixels * @param {Boolean} rotated @@ -579,7 +579,7 @@ cc.SpriteFrame.create = function (filename, rect, rotated, offset, originalSize) /** * deprecated since v3.0, please use new construction instead - * @method cc.SpriteFrame.createWithTexture + * @method createWithTexture * @deprecated */ cc.SpriteFrame.createWithTexture = cc.SpriteFrame.create; diff --git a/cocos2d/core/utils/base-node.js b/cocos2d/core/utils/base-node.js index 2e806d5c2b..7d469e9b51 100644 --- a/cocos2d/core/utils/base-node.js +++ b/cocos2d/core/utils/base-node.js @@ -266,7 +266,7 @@ var BaseNode = cc.Class(/** @lends cc.Node# */{ /** * Rotation on y axis - * @property rotationX + * @property rotationY * @type {Number} */ rotationY: { @@ -622,10 +622,12 @@ var BaseNode = cc.Class(/** @lends cc.Node# */{ * Current active scene graph node which provides content size. * * @property _sizeProvider - * @type {_ccsg.Node} + * @type {Object} * @private */ + // _ccsg.Node this._sizeProvider = null; + }, destroy: function () {