Skip to content

Commit da73e4c

Browse files
committed
fix misspellings
1 parent 94904ab commit da73e4c

File tree

31 files changed

+60
-60
lines changed

31 files changed

+60
-60
lines changed

CCBoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,7 @@ var _initSys = function () {
13491349
* @constant
13501350
* @type {Number}
13511351
*/
1352-
sys.LANGUAGE_UNKNOWN = "unkonwn";
1352+
sys.LANGUAGE_UNKNOWN = "unknown";
13531353

13541354
/**
13551355
* @memberof cc.sys

CHANGELOG.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Cocos2d-x v3.7.1 @ August.12 2015
5757
[FIX] web: Fixed Cocos Studio parser issue that all elements are missing while the timeline action contains rotation
5858

5959
Cocos2d-x v3.7 Final @ July 20 2015
60-
[REFINE] web: Add compatible Uint16Array defintion
60+
[REFINE] web: Add compatible Uint16Array definition
6161

6262
[FIX] web: Fixed url check regular expression not supporting localhost issue
6363
[FIX] web: Fixed issue that sprite doesn't update texture rect correctly
@@ -200,7 +200,7 @@ Cocos2d-JS v3.5 @ April 1 2015
200200
8. Fixed a bug of Cocos Studio parser that the background color of `ccui.Layout` can't be parsed correctly.
201201
9. Fixed a bug of `cc.ClippingNode` that it doesn't work when set `inverted` to true in Canvas Mode.
202202
10. Fixed a bug of `ccs.Armature` that its name was modified to animation name when loading from json files.
203-
11. Fixed a bug of `ccui.PageView` that it cancel child touch during movment of page view.
203+
11. Fixed a bug of `ccui.PageView` that it cancel child touch during movement of page view.
204204
12. Fixed a bug of `cc.Scheduler` that its parameter `repeat` is invalid in schedule function.
205205
13. Fixed a bug of `cc.Scheduler` that `unschedule` function may fail.
206206

@@ -363,7 +363,7 @@ Cocos2d-JS v3.2 RC0 @ Dec.11, 2014
363363
6. Fixed an issue of `cc.ParticleSystem` that it can't change its texture mode and shape type in Canvas mode.
364364
7. Fixed an issue of `cc.Layer`'s bake function that its position is incorrect when cc.view's scale isn't 1.
365365
8. Fixed an issue of `ccs.ArmatureAnimation`'s `setMovementEventCallFunc` and `setFrameEventCallFunc`.
366-
9. Fixed an issue of `console.log` that it isn't a funtion on IE9.
366+
9. Fixed an issue of `console.log` that it isn't a function on IE9.
367367
10. Fixed an issue of `CSLoader` that it will add duplicate resources to sprite frame cache.
368368
11. Fixed an issue of `cc.ProgressTimer` that its setColor is not taking effect.
369369
12. Fixed an issue of `cc.loader` that it will throw an error when loading a remote texture.

cocos2d/actions/CCActionEase.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1770,7 +1770,7 @@ cc.easeBounceOut = function(){
17701770

17711771
/**
17721772
* cc.EaseBounceInOut action. <br />
1773-
* Eased bounce effect at the begining and ending.
1773+
* Eased bounce effect at the beginning and ending.
17741774
* @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action.
17751775
* @class
17761776
* @extends cc.EaseBounce
@@ -1823,7 +1823,7 @@ cc.EaseBounceInOut = cc.EaseBounce.extend(/** @lends cc.EaseBounceInOut# */{
18231823

18241824
/**
18251825
* Creates the action. <br />
1826-
* Eased bounce effect at the begining and ending.
1826+
* Eased bounce effect at the beginning and ending.
18271827
* @static
18281828
* @deprecated since v3.0 <br /> Please use action.easing(cc.easeBounceInOut())
18291829
* @param {cc.ActionInterval} action
@@ -1857,7 +1857,7 @@ cc._easeBounceInOutObj = {
18571857

18581858
/**
18591859
* Creates the action easing object. <br />
1860-
* Eased bounce effect at the begining and ending.
1860+
* Eased bounce effect at the beginning and ending.
18611861
* @function
18621862
* @return {Object}
18631863
* @example
@@ -2050,7 +2050,7 @@ cc.easeBackOut = function(){
20502050

20512051
/**
20522052
* cc.EaseBackInOut action. <br />
2053-
* Begining of cc.EaseBackIn. Ending of cc.EaseBackOut.
2053+
* Beginning of cc.EaseBackIn. Ending of cc.EaseBackOut.
20542054
* @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action.
20552055
* @class
20562056
* @extends cc.ActionEase
@@ -2104,7 +2104,7 @@ cc.EaseBackInOut = cc.ActionEase.extend(/** @lends cc.EaseBackInOut# */{
21042104

21052105
/**
21062106
* Creates the action. <br />
2107-
* Begining of cc.EaseBackIn. Ending of cc.EaseBackOut.
2107+
* Beginning of cc.EaseBackIn. Ending of cc.EaseBackOut.
21082108
* @static
21092109
* @param {cc.ActionInterval} action
21102110
* @return {cc.EaseBackInOut}
@@ -2139,7 +2139,7 @@ cc._easeBackInOutObj = {
21392139

21402140
/**
21412141
* Creates the action easing object. <br />
2142-
* Begining of cc.EaseBackIn. Ending of cc.EaseBackOut.
2142+
* Beginning of cc.EaseBackIn. Ending of cc.EaseBackOut.
21432143
* @function
21442144
* @return {Object}
21452145
* @example

cocos2d/core/CCActionManager.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ cc.ActionManager = cc.Class.extend(/** @lends cc.ActionManager# */{
102102

103103
//check if the action target already exists
104104
var element = this._hashTargets[target.__instanceId];
105-
//if doesnt exists, create a hashelement and push in mpTargets
105+
//if doesn't exists, create a hashelement and push in mpTargets
106106
if (!element) {
107107
element = new cc.HashElement();
108108
element.paused = paused;

cocos2d/core/base-nodes/CCNode.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
15041504
}
15051505
},
15061506

1507-
//scene managment
1507+
//scene management
15081508
/**
15091509
* <p>
15101510
* Event callback that is invoked every time when CCNode enters the 'stage'. <br/>

cocos2d/core/platform/CCClass.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ var ClassManager = {
7575
ClassManager[classId] = _super;
7676
// Copy the properties over onto the new prototype. We make function
7777
// properties non-eumerable as this makes typeof === 'function' check
78-
// unneccessary in the for...in loop used 1) for generating Class()
78+
// unnecessary in the for...in loop used 1) for generating Class()
7979
// 2) for cc.clone and perhaps more. It is also required to make
8080
// these function properties cacheable in Carakan.
8181
var desc = { writable: true, enumerable: false, configurable: true };
@@ -269,7 +269,7 @@ cc.clone = function (obj) {
269269

270270
// Assuming that the constuctor above initialized all properies on obj, the
271271
// following keyed assignments won't turn newObj into dictionary mode
272-
// becasue they're not *appending new properties* but *assigning existing
272+
// because they're not *appending new properties* but *assigning existing
273273
// ones* (note that appending indexed properties is another story). See
274274
// CCClass.js for a link to the devils when the assumption fails.
275275
for (var key in obj) {

cocos2d/core/platform/CCCommon.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ cc.KEY = {
135135
'-':109,
136136
'numdel':110,
137137
'/':111,
138-
f1:112, //f1-f12 dont work on ie
138+
f1:112, //f1-f12 don't work on ie
139139
f2:113,
140140
f3:114,
141141
f4:115,
@@ -169,7 +169,7 @@ cc.KEY = {
169169
closebracket:221,
170170
quote:222,
171171

172-
// gamepad controll
172+
// gamepad control
173173
dpadLeft:1000,
174174
dpadRight:1001,
175175
dpadUp:1003,

cocos2d/core/platform/CCInputManager.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ cc.inputManager = /** @lends cc.inputManager# */{
343343
* @return {cc.Point}
344344
*/
345345
getPointByEvent: function(event, pos){
346-
if (event.pageX != null) //not avalable in <= IE8
346+
if (event.pageX != null) //not available in <= IE8
347347
return {x: event.pageX, y: event.pageY};
348348

349349
pos.left -= document.body.scrollLeft;

cocos2d/core/platform/CCMacro.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ cc.arrayVerifyType = function (arr, type) {
785785
};
786786

787787
/**
788-
* Searches for the first occurance of object and removes it. If object is not found the function has no effect.
788+
* Searches for the first occurrence of object and removes it. If object is not found the function has no effect.
789789
* @function
790790
* @param {Array} arr Source Array
791791
* @param {*} delObj remove object

cocos2d/core/platform/CCTypes.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ cc.Color = function (r, g, b, a) {
4444
* Generate a color object based on multiple forms of parameters
4545
* @example
4646
*
47-
* // 1. All channels seperately as parameters
47+
* // 1. All channels separately as parameters
4848
* var color1 = cc.color(255, 255, 255, 255);
4949
*
5050
* // 2. Convert a hex string to a color
@@ -345,7 +345,7 @@ cc._Dictionary = cc.Class.extend({
345345
* fontDef.fontSize = 12;
346346
* ...
347347
*
348-
* OR using inline definition usefull for constructor injection
348+
* OR using inline definition useful for constructor injection
349349
*
350350
* var fontDef = new cc.FontDefinition({
351351
* fontName: "Arial",

cocos2d/core/support/CCPointExtension.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ cc.pSameAs = function (A, B) {
454454

455455

456456

457-
// High Perfomance In Place Operationrs ---------------------------------------
457+
// High Performance In Place Operationrs ---------------------------------------
458458

459459
/**
460460
* sets the position of the point to 0

cocos2d/core/textures/TexturesWebGL.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ cc._tmp.WebGLTexture2D = function () {
224224
},
225225

226226
keepData: function (data, length) {
227-
//The texture data mustn't be saved becuase it isn't a mutable texture.
227+
//The texture data mustn't be saved because it isn't a mutable texture.
228228
return data;
229229
},
230230

cocos2d/kazmath/gl/matrix.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
};
8686

8787
cc.kmGLPopMatrix = function () {
88-
//No need to lazy initialize, you shouldnt be popping first anyway!
88+
//No need to lazy initialize, you shouldn't be popping first anyway!
8989
//cc.km_mat4_stack_pop(cc.current_stack, null);
9090
cc.current_stack.top = cc.current_stack.stack.pop();
9191
};

cocos2d/kazmath/mat3.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ window.Float32Array = window.Float32Array || window.Array;
123123
m = | 1 4 7 | 1 4 |
124124
| 2 5 8 | 2 5 |
125125
now sum up the products of the diagonals going to the right (i.e. 0,4,8)
126-
and substract the products of the other diagonals (i.e. 2,4,6)
126+
and subtract the products of the other diagonals (i.e. 2,4,6)
127127
*/
128128
var output = mat[0] * mat[4] * mat[8] + mat[1] * mat[5] * mat[6] + mat[2] * mat[3] * mat[7];
129129
output -= mat[2] * mat[4] * mat[6] + mat[0] * mat[5] * mat[7] + mat[1] * mat[3] * mat[8];

cocos2d/kazmath/mat4.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
//Returns an upper and a lower triangular matrix which are L and R in the Gauss algorithm
107107
cc.math.Matrix4._gaussj = function (a, b) {
108108
var i, icol = 0, irow = 0, j, k, l, ll, n = 4, m = 4, selElement;
109-
var big, dum, pivinv;
109+
var big, dumb, pivinv;
110110
var indxc = [0, 0, 0, 0], indxr = [0, 0, 0, 0], ipiv = [0, 0, 0, 0];
111111

112112
/* for (j = 0; j < n; j++) {
@@ -151,13 +151,13 @@
151151

152152
for (ll = 0; ll < n; ll++) {
153153
if (ll !== icol) {
154-
dum = a.get(ll, icol);
154+
dumb = a.get(ll, icol);
155155
a.set(ll, icol, 0.0);
156156
for (l = 0; l < n; l++)
157-
a.set(ll, l, a.get(ll, l) - a.get(icol, l) * dum);
157+
a.set(ll, l, a.get(ll, l) - a.get(icol, l) * dumb);
158158

159159
for (l = 0; l < m; l++)
160-
b.set(ll, l, a.get(ll, l) - b.get(icol, l) * dum);
160+
b.set(ll, l, a.get(ll, l) - b.get(icol, l) * dumb);
161161
}
162162
}
163163
}

cocos2d/kazmath/plane.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
Planea = Nx
8282
Planeb = Ny
8383
Planec = Nz
84-
Planed = −N⋅P
84+
Planned = −N⋅P
8585
*/
8686
return new cc.math.Plane(normal.x, normal.y, normal.z, -normal.dot(vec3));
8787
};

cocos2d/kazmath/simd_benchmark/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<link href="http://cdn.bootcss.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
88
<body>
99
<h1 align="center" id="head">Running benchmarks...</h1>
10-
<div sytle="padding: 10px">
10+
<div style="padding: 10px">
1111
<div style="width: 50%;float: left">
1212
<h2 align="center" id="time"></h2>
1313
<canvas id="canvasTime"></canvas>

cocos2d/particle/CCParticleSystem.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ cc.Particle.TemporaryPoints = [
124124
* <p>
125125
* Particle System base class. <br/>
126126
* Attributes of a Particle System:<br/>
127-
* - emmision rate of the particles<br/>
127+
* - emission rate of the particles<br/>
128128
* - Gravity Mode (Mode A): <br/>
129129
* - gravity <br/>
130130
* - direction <br/>

cocos2d/render-texture/CCRenderTexture.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{
334334
},
335335

336336
/**
337-
* When enabled, it will render its children into the texture automatically. Disabled by default for compatiblity reasons. <br/>
337+
* When enabled, it will render its children into the texture automatically. Disabled by default for compatibility reasons. <br/>
338338
* Will be enabled in the future.
339339
* @return {Boolean}
340340
*/
@@ -343,7 +343,7 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{
343343
},
344344

345345
/**
346-
* When enabled, it will render its children into the texture automatically. Disabled by default for compatiblity reasons. <br/>
346+
* When enabled, it will render its children into the texture automatically. Disabled by default for compatibility reasons. <br/>
347347
* Will be enabled in the future.
348348
* @return {Boolean}
349349
*/

cocos2d/text-input/CCIMEDispatcher.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ cc.IMEDispatcher = cc.Class.extend(/** @lends cc.imeDispatcher# */{
389389
this._currentInputString = delegate.string || "";
390390

391391
var tipMessage = delegate.getTipMessage ? delegate.getTipMessage() : "please enter your word:";
392-
// wechat cover the prompt funciton .So need use the Window.prototype.prompt
392+
// wechat cover the prompt function .So need use the Window.prototype.prompt
393393
var userInput;
394394
if(window.Window && Window.prototype.prompt != prompt){
395395
userInput = Window.prototype.prompt.call(window, tipMessage, this._currentInputString);

cocos2d/tilemap/CCTMXTiledMap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ cc.TMX_ORIENTATION_ISO = 2;
7272
*
7373
* <p>Limitations: <br />
7474
* - It only supports one tileset per layer. <br />
75-
* - Embeded images are not supported <br />
75+
* - Embedded images are not supported <br />
7676
* - It only supports the XML format (the JSON format is not supported)</p>
7777
*
7878
* <p>Technical description: <br />

cocos2d/transitions/CCTransition.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ cc.TransitionRotoZoom = cc.TransitionScene.extend(/** @lends cc.TransitionRotoZo
357357
});
358358

359359
/**
360-
* Creates a Transtion rotation and zoom
360+
* Creates a Transition rotation and zoom
361361
* @deprecated since v3.0,please use new cc.TransitionRotoZoom(t, scene) instead
362362
* @param {Number} t time in seconds
363363
* @param {cc.Scene} scene the scene to work with
@@ -665,7 +665,7 @@ cc.TransitionSlideInL = cc.TransitionScene.extend(/** @lends cc.TransitionSlideI
665665
this._inScene.setPosition(-cc.director.getWinSize().width + cc.ADJUST_FACTOR, 0);
666666
},
667667
/**
668-
* returns the action that will be performed by the incomming and outgoing scene
668+
* returns the action that will be performed by the incoming and outgoing scene
669669
* @return {cc.MoveBy}
670670
*/
671671
action:function () {
@@ -721,7 +721,7 @@ cc.TransitionSlideInR = cc.TransitionSlideInL.extend(/** @lends cc.TransitionSli
721721
this._inScene.setPosition(cc.director.getWinSize().width - cc.ADJUST_FACTOR, 0);
722722
},
723723
/**
724-
* returns the action that will be performed by the incomming and outgoing scene
724+
* returns the action that will be performed by the incoming and outgoing scene
725725
* @return {cc.MoveBy}
726726
*/
727727
action:function () {
@@ -771,7 +771,7 @@ cc.TransitionSlideInB = cc.TransitionSlideInL.extend(/** @lends cc.TransitionSli
771771
},
772772

773773
/**
774-
* returns the action that will be performed by the incomming and outgoing scene
774+
* returns the action that will be performed by the incoming and outgoing scene
775775
* @return {cc.MoveBy}
776776
*/
777777
action:function () {
@@ -821,7 +821,7 @@ cc.TransitionSlideInT = cc.TransitionSlideInL.extend(/** @lends cc.TransitionSli
821821
},
822822

823823
/**
824-
* returns the action that will be performed by the incomming and outgoing scene
824+
* returns the action that will be performed by the incoming and outgoing scene
825825
* @return {cc.MoveBy}
826826
*/
827827
action:function () {

extensions/ccb-reader/CCBAnimationManager.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ cc.BuilderAnimationManager = cc.Class.extend({
606606
} else if (easingType === CCB_KEYFRAME_EASING_ELASTIC_INOUT) {
607607
return action.easing(cc.easeElasticInOut(easingOpt));
608608
} else {
609-
cc.log("BuilderReader: Unkown easing type " + easingType);
609+
cc.log("BuilderReader: Unknown easing type " + easingType);
610610
return action;
611611
}
612612
},

extensions/ccui/uiwidgets/scroll-widget/UIPageView.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* The PageView control of Cocos UI.
2828
* @class
2929
* @extends ccui.Layout
30-
* @exmaple
30+
* @example
3131
* var pageView = new ccui.PageView();
3232
* pageView.setTouchEnabled(true);
3333
* pageView.addPage(new ccui.Layout());

extensions/cocostudio/timeline/Frame.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ ccs.PositionFrame = ccs.Frame.extend({
746746
},
747747

748748
/**
749-
* Gets the postion x
749+
* Gets the position x
750750
* @returns {Number}
751751
*/
752752
getX: function(){

extensions/editbox/CCdomNode.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ cc.DOM.forSprite = function (x) {
596596
* @param x
597597
*/
598598
cc.DOM.placeHolder = function (x) {
599-
//creating a placeholder dom to simulate other ccNode in the hierachy
599+
//creating a placeholder dom to simulate other ccNode in the hierarchy
600600
x.dom = cc.$new('div');
601601
x.placeholder = true;
602602
x.dom.style.position = 'absolute';

0 commit comments

Comments
 (0)