diff --git a/cocos2d/core/components/CCButton.js b/cocos2d/core/components/CCButton.js index e4a9bc9d54..1e9c44a1dc 100644 --- a/cocos2d/core/components/CCButton.js +++ b/cocos2d/core/components/CCButton.js @@ -248,7 +248,7 @@ var Button = cc.Class({ /** * If Button is clicked, it will trigger event's handler - * @property {[cc.Component.EventHandler]} clickEvents + * @property {cc.Component.EventHandler} clickEvents */ clickEvents: { default: [], diff --git a/cocos2d/core/components/CCEditBox.js b/cocos2d/core/components/CCEditBox.js index 4b6ed3735c..1e767d310a 100644 --- a/cocos2d/core/components/CCEditBox.js +++ b/cocos2d/core/components/CCEditBox.js @@ -31,7 +31,7 @@ var InputFlag = _ccsg.EditBox.InputFlag; /** * cc.EditBox is a component for inputing text, you can use it to gather small amounts of text from users. * @class EditBox - * @extends ComponentInSG + * @extends _ComponentInSG */ var EditBox = cc.Class({ name: 'cc.EditBox', diff --git a/cocos2d/core/components/CCLabel.js b/cocos2d/core/components/CCLabel.js index 65de82f838..8a68f7ef0b 100644 --- a/cocos2d/core/components/CCLabel.js +++ b/cocos2d/core/components/CCLabel.js @@ -56,7 +56,7 @@ var Label = cc.Class({ /** * Horizontal Alignment of label - * @property {Label.HorizontalAlign} horizontalAlign + * @property {cc.TextAlignment} horizontalAlign */ horizontalAlign: { default: HorizontalAlign.LEFT, @@ -70,7 +70,7 @@ var Label = cc.Class({ /** * Vertical Alignment of label - * @property {Label.VerticalAlign} verticalAlign + * @property {cc.VerticalTextAlignment} verticalAlign */ verticalAlign: { default: VerticalAlign.TOP, diff --git a/cocos2d/core/editbox/CCSGEditBox.js b/cocos2d/core/editbox/CCSGEditBox.js index 4f9aa7dc55..48d79524e9 100644 --- a/cocos2d/core/editbox/CCSGEditBox.js +++ b/cocos2d/core/editbox/CCSGEditBox.js @@ -29,13 +29,28 @@ /** * Enum for keyboard return types * @readonly - * @enum {number} + * @enum cc.EditBox.KeyboardReturnType */ var KeyboardReturnType = cc.Enum({ + /** + * @property {Number} DEFAULT + */ DEFAULT: 0, + /** + * @property {Number} DONE + */ DONE: 1, + /** + * @property {Number} SEND + */ SEND: 2, + /** + * @property {Number} SEARCH + */ SEARCH: 3, + /** + * @property {Number} GO + */ GO: 4 }); @@ -43,40 +58,49 @@ var KeyboardReturnType = cc.Enum({ * The EditBox's InputMode defines the type of text that the user is allowed to enter * @readonly * @enum {number} - * @memberof cc.EditBox + * @memberof cc.EditBox.InputMode */ var InputMode = cc.Enum({ + /** + * @property {Number} ANY + */ ANY: 0, /** * The user is allowed to enter an e-mail address. + * @property {Number} EMAILADDR */ EMAILADDR: 1, /** * The user is allowed to enter an integer value. + * @property {Number} NUMERIC */ NUMERIC: 2, /** * The user is allowed to enter a phone number. + * @property {Number} PHONENUMBER */ PHONENUMBER: 3, /** * The user is allowed to enter a URL. + * @property {Number} URL */ URL: 4, /** * The user is allowed to enter a real number value. * This extends kEditBoxInputModeNumeric by allowing a decimal point. + * @property {Number} DECIMAL */ DECIMAL: 5, /** * The user is allowed to enter any text, except for line breaks. + * @property {Number} SINGLELINE */ SINGLELINE: 6 }); @@ -84,13 +108,14 @@ var InputMode = cc.Enum({ /** * Enum for the EditBox's input flags * @readonly - * @enum {number} - * @memberof cc.EditBox + * @enum cc.EditBox.InputFlag */ var InputFlag = cc.Enum({ /** * Indicates that the text entered is confidential data that should be * obscured whenever possible. This implies EDIT_BOX_INPUT_FLAG_SENSITIVE. + * + * @property {Number} PASSWORD */ PASSWORD: 0, @@ -99,23 +124,31 @@ var InputFlag = cc.Enum({ * implementation must never store into a dictionary or table for use * in predictive, auto-completing, or other accelerated input schemes. * A credit card number is an example of sensitive data. + * + * @property {Number} SENSITIVE */ SENSITIVE: 1, /** * This flag is a hint to the implementation that during text editing, * the initial letter of each word should be capitalized. + * + * @property {Number} INITIAL_CAPS_WORD */ INITIAL_CAPS_WORD: 2, /** * This flag is a hint to the implementation that during text editing, * the initial letter of each sentence should be capitalized. + * + * @property {Number} INITIAL_CAPS_SENTENCE */ INITIAL_CAPS_SENTENCE: 3, /** * Capitalize all characters automatically. + * + * @property {Number} INITIAL_CAPS_ALL_CHARACTERS */ INITIAL_CAPS_ALL_CHARACTERS: 4 }); diff --git a/cocos2d/core/platform/CCAssetLibrary.js b/cocos2d/core/platform/CCAssetLibrary.js index ada0aadd02..d21554528e 100644 --- a/cocos2d/core/platform/CCAssetLibrary.js +++ b/cocos2d/core/platform/CCAssetLibrary.js @@ -484,6 +484,7 @@ var AssetLibrary = { * init the asset library * * @method init + * @param {Object} options * @param {String} options.libraryPath - 能接收的任意类型的路径,通常在编辑器里使用绝对的,在网页里使用相对的。 * @param {Object} options.mountPaths - mount point of actual urls for raw assets (only used in editor) * @param {Object} [options.rawAssets] - uuid to raw asset's urls (only used in runtime) diff --git a/cocos2d/core/platform/deserialize.js b/cocos2d/core/platform/deserialize.js index c5bafec3f8..12c98870fd 100644 --- a/cocos2d/core/platform/deserialize.js +++ b/cocos2d/core/platform/deserialize.js @@ -497,7 +497,7 @@ var _Deserializer = (function () { * * @method deserialize * @param {String|Object} data - the serialized cc.Asset json string or json object. - * @param {deserialize.Details} [result] - additional loading result + * @param {Details} [result] - additional loading result * @param {Object} [options] * @return {object} the main data(asset) */ diff --git a/cocos2d/core/sprites/CCAnimation.js b/cocos2d/core/sprites/CCAnimation.js index 21466fbaf1..56925427da 100644 --- a/cocos2d/core/sprites/CCAnimation.js +++ b/cocos2d/core/sprites/CCAnimation.js @@ -160,7 +160,7 @@ cc.AnimationFrame.create = function(spriteFrame,delayUnits,userInfo){ * The cc.SpriteFrameAnimation object contains cc.SpriteFrame objects, and a possible delay between the frames.
* You can animate a cc.SpriteFrameAnimation object by using the cc.Animate action. *

- * @class + * @class SpriteFrameAnimation * @extends cc._Class * @param {Array} frames * @param {Number} delay