Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
haxpor committed Mar 10, 2018
1 parent 465b062 commit 844f171
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ Cocos2d-JS v3.4 Beta0 @ March 19 2015

* Bug fixes:
1. Added `getSpriteFrame` to `cc.Sprite` to fix API inconsistency.
2. Added `getObejct` to `cc.TMXObjectGroup` to fix API inconsistency.
2. Added `getObject` to `cc.TMXObjectGroup` to fix API inconsistency.
3. Added `addImageAsync` to `cc.textureCache` to fix API inconsistency.
4. Fixed a bug of `cc.text` that its default font name is incorrect.
5. Fixed a bug of `ccui.PageView` that its `getPage` doesn't work.
Expand Down
2 changes: 1 addition & 1 deletion cocos2d/actions/CCActionEase.js
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ cc._easeElasticInObj = {

/**
* !#en
* Creates the action easing obejct with the period in radians (default is 0.3). <br />
* Creates the action easing object with the period in radians (default is 0.3). <br />
* Reference easeInElastic: <br />
* http://www.zhihu.com/question/21981571/answer/19925418
* !#zh
Expand Down
4 changes: 2 additions & 2 deletions cocos2d/core/load-pipeline/loading-items.js
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ LoadingItems.ItemState = new cc.Enum(ItemState);
* @param {Array} urlList The items array.
* @param {Function} onProgress The progression callback, refer to {{#crossLink "LoadingItems.onProgress"}}{{/crossLink}}
* @param {Function} onComplete The completion callback, refer to {{#crossLink "LoadingItems.onComplete"}}{{/crossLink}}
* @return {LoadingItems} The LoadingItems queue obejct
* @return {LoadingItems} The LoadingItems queue object
* @example
* LoadingItems.create(cc.loader, ['a.png', 'b.plist'], function (completedCount, totalCount, item) {
* var progress = (100 * completedCount / totalCount).toFixed(2);
Expand Down Expand Up @@ -359,7 +359,7 @@ LoadingItems.create = function (pipeline, urlList, onProgress, onComplete) {
* @method getQueue
* @static
* @param {Object} item The item to query
* @return {LoadingItems} The LoadingItems queue obejct
* @return {LoadingItems} The LoadingItems queue object
*/
LoadingItems.getQueue = function (item) {
return item.queueId ? _queues[item.queueId] : null;
Expand Down

0 comments on commit 844f171

Please sign in to comment.