update CCButton and CCSprite and deprecated

This commit is contained in:
knoxHuang
2015-12-21 17:43:00 +08:00
parent 6e673df485
commit 38cae90d05
3 changed files with 6 additions and 24 deletions
+1 -1
View File
@@ -493,7 +493,7 @@ var Button = cc.Class({
}
}
else if (transition === Transition.SPRITE && this._sprite && sprite) {
this._sprite.spriteframe = sprite;
this._sprite.spriteFrame = sprite;
}
},
+2 -22
View File
@@ -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);
+3 -1
View File
@@ -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);