From 3e73454df7dd43fa3b123ea5347bf6638955a5e4 Mon Sep 17 00:00:00 2001 From: zhangbin Date: Sun, 12 Jun 2016 14:33:35 +0800 Subject: [PATCH 1/2] Rename the method getTileset/setTileset to getTileSet/setTileSet. --- cocos2d/tilemap/CCSGTMXLayer.js | 4 ++-- cocos2d/tilemap/CCTiledLayer.js | 41 +++++++++++++++++++++++++++------ 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/cocos2d/tilemap/CCSGTMXLayer.js b/cocos2d/tilemap/CCSGTMXLayer.js index 7a25435a3d..a5faf58c35 100644 --- a/cocos2d/tilemap/CCSGTMXLayer.js +++ b/cocos2d/tilemap/CCSGTMXLayer.js @@ -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; }, diff --git a/cocos2d/tilemap/CCTiledLayer.js b/cocos2d/tilemap/CCTiledLayer.js index 569583638e..5c053f2067 100644 --- a/cocos2d/tilemap/CCTiledLayer.js +++ b/cocos2d/tilemap/CCTiledLayer.js @@ -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,15 +456,42 @@ var TiledLayer = cc.Class({ /** * !#en Tile set information for the layer. * !#zh 设置 layer 的 Tileset 信息。 + * @method setTileSet + * @param {TMXTilesetInfo} tileset + * @example + * tiledLayer.setTileSet(tileset); + */ + setTileSet:function (tileset) { + if (this._sgNode) { + this._sgNode.setTileSet(tileset); + } + }, + + + /** + * !#en Tile set information for the layer. + * !#zh 获取 layer 的 Tileset 信息。 + * @deprecated Please use getTileSet instead. + * @method getTileset + * @return {TMXTilesetInfo} + * @example + * var tileset = tiledLayer.getTileset(); + */ + getTileset:function () { + return this.getTileSet(); + }, + + /** + * !#en Tile set information for the layer. + * !#zh 设置 layer 的 Tileset 信息。 + * @deprecated Please use setTileSet instead. * @method setTileset * @param {TMXTilesetInfo} tileset * @example * tiledLayer.getTileset(tileset); */ setTileset:function (tileset) { - if (this._sgNode) { - this._sgNode.setTileset(tileset); - } + this.setTileSet(tileset); }, /** From f1eb36dbb6116e07b1ba4acfd15638ea10dd1c4e Mon Sep 17 00:00:00 2001 From: zhangbin Date: Sun, 12 Jun 2016 14:46:46 +0800 Subject: [PATCH 2/2] Move the deprecated methods to deprecated.js --- cocos2d/deprecated.js | 18 ++++++++++++++++++ cocos2d/tilemap/CCTiledLayer.js | 27 --------------------------- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/cocos2d/deprecated.js b/cocos2d/deprecated.js index b5d44b1a3c..06d94e6e9c 100644 --- a/cocos2d/deprecated.js +++ b/cocos2d/deprecated.js @@ -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)); diff --git a/cocos2d/tilemap/CCTiledLayer.js b/cocos2d/tilemap/CCTiledLayer.js index 5c053f2067..117ae1fcca 100644 --- a/cocos2d/tilemap/CCTiledLayer.js +++ b/cocos2d/tilemap/CCTiledLayer.js @@ -467,33 +467,6 @@ var TiledLayer = cc.Class({ } }, - - /** - * !#en Tile set information for the layer. - * !#zh 获取 layer 的 Tileset 信息。 - * @deprecated Please use getTileSet instead. - * @method getTileset - * @return {TMXTilesetInfo} - * @example - * var tileset = tiledLayer.getTileset(); - */ - getTileset:function () { - return this.getTileSet(); - }, - - /** - * !#en Tile set information for the layer. - * !#zh 设置 layer 的 Tileset 信息。 - * @deprecated Please use setTileSet instead. - * @method setTileset - * @param {TMXTilesetInfo} tileset - * @example - * tiledLayer.getTileset(tileset); - */ - setTileset:function (tileset) { - this.setTileSet(tileset); - }, - /** * !#en Layer orientation, which is the same as the map orientation. * !#zh 获取 Layer 方向(同地图方向)。