Merge pull request #786 from natural-law/issue3324

Rename the method getTileset/setTileset to getTileSet/setTileSet.
This commit is contained in:
Jare Guo
2016-06-12 14:50:03 +08:00
committed by GitHub
3 changed files with 28 additions and 10 deletions
+18
View File
@@ -206,6 +206,24 @@ if (CC_DEV) {
return cc.js.array.copy;
});
/**
* Get the Tile set information for the layer.
* @memberof cc.TiledLayer
* @deprecated
* @return {TMXTilesetInfo}
* @function
*/
js.obsolete(cc.TiledLayer.prototype, 'cc.TiledLayer.getTileset', 'getTileSet');
/**
* Set the Tile set information for the layer.
* @memberof cc.TiledLayer
* @deprecated
* @param {TMXTilesetInfo}
* @function
*/
js.obsolete(cc.TiledLayer.prototype, 'cc.TiledLayer.setTileset', 'setTileSet');
Object.defineProperty(cc._SGComponent.prototype, 'visible', {
get: function () {
cc.warn('The "visible" property of %s is deprecated, use "enabled" instead please.', cc.js.getClassName(this));
+2 -2
View File
@@ -205,7 +205,7 @@ _ccsg.TMXLayer = cc.SpriteBatchNode.extend(/** @lends _ccsg.TMXLayer# */{
* Tile set information for the layer
* @return {cc.TMXTilesetInfo}
*/
getTileset:function () {
getTileSet:function () {
return this.tileset;
},
@@ -213,7 +213,7 @@ _ccsg.TMXLayer = cc.SpriteBatchNode.extend(/** @lends _ccsg.TMXLayer# */{
* Tile set information for the layer
* @param {cc.TMXTilesetInfo} Var
*/
setTileset:function (Var) {
setTileSet:function (Var) {
this.tileset = Var;
},
+8 -8
View File
@@ -441,14 +441,14 @@ var TiledLayer = cc.Class({
/**
* !#en Tile set information for the layer.
* !#zh 获取 layer 的 Tileset 信息。
* @method getTileset
* @method getTileSet
* @return {TMXTilesetInfo}
* @example
* var tileset = tiledLayer.getTileset();
* var tileset = tiledLayer.getTileSet();
*/
getTileset:function () {
getTileSet:function () {
if (this._sgNode) {
return this._sgNode.getTileset();
return this._sgNode.getTileSet();
}
return null;
},
@@ -456,14 +456,14 @@ var TiledLayer = cc.Class({
/**
* !#en Tile set information for the layer.
* !#zh 设置 layer 的 Tileset 信息。
* @method setTileset
* @method setTileSet
* @param {TMXTilesetInfo} tileset
* @example
* tiledLayer.getTileset(tileset);
* tiledLayer.setTileSet(tileset);
*/
setTileset:function (tileset) {
setTileSet:function (tileset) {
if (this._sgNode) {
this._sgNode.setTileset(tileset);
this._sgNode.setTileSet(tileset);
}
},