From 38cae90d050beba94a551bfc76c836fd2ea121d1 Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Mon, 21 Dec 2015 17:43:00 +0800 Subject: [PATCH] update CCButton and CCSprite and deprecated --- cocos2d/core/components/CCButton.js | 2 +- cocos2d/core/components/CCSprite.js | 24 ++---------------------- cocos2d/deprecated.js | 4 +++- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/cocos2d/core/components/CCButton.js b/cocos2d/core/components/CCButton.js index 47f0bfd803..9319875045 100644 --- a/cocos2d/core/components/CCButton.js +++ b/cocos2d/core/components/CCButton.js @@ -493,7 +493,7 @@ var Button = cc.Class({ } } else if (transition === Transition.SPRITE && this._sprite && sprite) { - this._sprite.spriteframe = sprite; + this._sprite.spriteFrame = sprite; } }, diff --git a/cocos2d/core/components/CCSprite.js b/cocos2d/core/components/CCSprite.js index 5c96e8c9a3..db297ebc3c 100644 --- a/cocos2d/core/components/CCSprite.js +++ b/cocos2d/core/components/CCSprite.js @@ -158,15 +158,6 @@ var Sprite = cc.Class({ return this.type === cc.SpriteType.SLICED }, - /** - * Get the original no 9-sliced sprite. - * @method getSprite - * @return {SpriteFrame} A sprite instance. - */ - getSprite : function(){ - return this._spriteFrame; - }, - /** * Initializes a 9-slice sprite with a texture file, a delimitation zone and * with the specified cap insets. @@ -216,17 +207,7 @@ var Sprite = cc.Class({ if (initialized === false) { return; } - this._spriteFrame = this._sgNode.getSprite(); - }, - - /** - * Sets a new sprite frame to the sprite. - * @method setSpriteFrame - * @param {SpriteFrame} spriteFrame - * @param {Rect} capInsets - */ - setSpriteFrame: function (spriteFrame) { - this.spriteFrame = spriteFrame; + this._spriteFrame = this._sgNode.getSpriteFrame(); }, /** @@ -396,8 +377,7 @@ var Sprite = cc.Class({ var misc = require('../utils/misc'); var SameNameGetSets = ['atlas', 'capInsets', 'insetLeft', 'insetTop', 'insetRight', 'insetBottom']; var DiffNameGetSets = { - type: [ null, 'setRenderingType'], - spriteFrame: ['getSprite', null], + type: [ null, 'setRenderingType'] }; misc.propertyDefine(Sprite, SameNameGetSets, DiffNameGetSets); diff --git a/cocos2d/deprecated.js b/cocos2d/deprecated.js index 5aebc0f2fe..2e5009957c 100644 --- a/cocos2d/deprecated.js +++ b/cocos2d/deprecated.js @@ -435,7 +435,9 @@ if (CC_DEV) { ignoreAnchorPointForPosition: 'instance.ignoreAnchor', getPreferredSize: 'node.getContentSize', setPreferredSize: 'node.setContentSize', - updateWithSprite: 'spriteFrame' + updateWithSprite: 'spriteFrame', + getSpriteFrame: 'spriteFrame', + setSpriteFrame: 'spriteFrame', }); shouldNotUseNodeProp(cc.Sprite);