diff --git a/cocos2d/core/load-pipeline/CCLoader.js b/cocos2d/core/load-pipeline/CCLoader.js index c3fa17a19e..d022891a30 100644 --- a/cocos2d/core/load-pipeline/CCLoader.js +++ b/cocos2d/core/load-pipeline/CCLoader.js @@ -671,16 +671,14 @@ proto.getResCount = function () { /** * !#en Get all resource dependencies of the requested asset in an array, including itself. - * The owner parameter accept the following types: 1. The asset itself; 2. The resource url; 3. The asset's uuid. + * The owner parameter accept the following types: 1. The asset itself; 2. The resource url; 3. The asset's uuid.
* The returned array stores the dependencies with their uuids, after retrieve dependencies, - * you can release them, access dependent assets by passing the uuid to {{#crossLink "loader/getRes:method"}}{{/crossLink}}, or other stuffs you want. + * you can release them, access dependent assets by passing the uuid to {{#crossLink "loader/getRes:method"}}{{/crossLink}}, or other stuffs you want.
* For release all dependencies of an asset, please refer to {{#crossLink "loader/release:method"}}{{/crossLink}} * Here is some examples: - * !#zh 获取一个指定资源的所有依赖资源,包含它自身,并保存在数组中返回。owner 参数接收以下几种类型: - * 1. 资源 asset 对象;2. 资源目录下的 url;3. 资源的 uuid - * 返回的数组将仅保存依赖资源的 uuid,获取这些 uuid 后,你可以从 loader 释放这些资源;通过 {{#crossLink "loader/getRes:method"}}{{/crossLink}} 获取某个资源或者其他你需要的处理。 - * 想要释放一个资源及其依赖资源,可以参考 {{#crossLink "loader/release:method"}}{{/crossLink}}。 - * 下面是一些示例代码: + * !#zh 获取一个指定资源的所有依赖资源,包含它自身,并保存在数组中返回。owner 参数接收以下几种类型:1. 资源 asset 对象;2. 资源目录下的 url;3. 资源的 uuid。
+ * 返回的数组将仅保存依赖资源的 uuid,获取这些 uuid 后,你可以从 loader 释放这些资源;通过 {{#crossLink "loader/getRes:method"}}{{/crossLink}} 获取某个资源或者进行其他你需要的操作。
+ * 想要释放一个资源及其依赖资源,可以参考 {{#crossLink "loader/release:method"}}{{/crossLink}}。下面是一些示例代码: * * @example * // Release all dependencies of a loaded prefab @@ -696,7 +694,8 @@ proto.getResCount = function () { * } * } * - * @param {Asset|RawAsset|String} owner The owner asset or the resource url or the asset's uuid + * @method getDependsRecursively + * @param {Asset|RawAsset|String} owner - The owner asset or the resource url or the asset's uuid * @returns {Array} */ proto.getDependsRecursively = function (owner) { diff --git a/cocos2d/core/platform/CCClass.js b/cocos2d/core/platform/CCClass.js index 78280ec0fa..cc9f56a00e 100644 --- a/cocos2d/core/platform/CCClass.js +++ b/cocos2d/core/platform/CCClass.js @@ -1170,7 +1170,9 @@ function parseAttributes (cls, attrs, className, propName, usedInGetter) { if (range.length >= 2) { (attrsProto || getAttrsProto())[attrsProtoKey + 'min'] = range[0]; attrsProto[attrsProtoKey + 'max'] = range[1]; - attrsProto[attrsProtoKey + 'step'] = range[2]; + if (range.length > 2) { + attrsProto[attrsProtoKey + 'step'] = range[2]; + } } else if (CC_DEV) { cc.errorID(3647); diff --git a/cocos2d/tilemap/CCTMXXMLParser.js b/cocos2d/tilemap/CCTMXXMLParser.js index e21c7d6c85..10bc3e76ae 100644 --- a/cocos2d/tilemap/CCTMXXMLParser.js +++ b/cocos2d/tilemap/CCTMXXMLParser.js @@ -752,7 +752,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ layer.offset = cc.p(parseFloat(selLayer.getAttribute('x')) || 0, parseFloat(selLayer.getAttribute('y')) || 0); var nodeValue = ''; - for (j = 0; j < data.childNodes.length; j++) { + for (let j = 0; j < data.childNodes.length; j++) { nodeValue += data.childNodes[j].nodeValue } nodeValue = nodeValue.trim(); @@ -804,7 +804,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ var layerProps = selLayer.querySelectorAll("properties > property"); if (layerProps) { var layerProp = {}; - for (var j = 0; j < layerProps.length; j++) { + for (let j = 0; j < layerProps.length; j++) { layerProp[layerProps[j].getAttribute('name')] = layerProps[j].getAttribute('value'); } layer.properties = layerProp; @@ -838,7 +838,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ var groupProps = selGroup.querySelectorAll("objectgroup > properties > property"); if (groupProps) { var parsedProps = {}; - for (j = 0; j < groupProps.length; j++) { + for (let j = 0; j < groupProps.length; j++) { parsedProps[groupProps[j].getAttribute('name')] = groupProps[j].getAttribute('value'); } // set the properties to the group @@ -848,7 +848,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ var objects = selGroup.querySelectorAll('object'); var getContentScaleFactor = cc.director.getContentScaleFactor(); if (objects) { - for (var j = 0; j < objects.length; j++) { + for (let j = 0; j < objects.length; j++) { var selObj = objects[j]; // The value for "type" was blank or not a valid class name // Create an instance of TMXObjectInfo to store the object and its properties