Merge pull request #3192 from pineoc/develop

fix misspellings

Author: pandamicro

Diff for: CCBoot.js

@@ -1375,7 +1375,7 @@ var _initSys = function () {
      * @constant
      * @type {Number}
      */
-    sys.LANGUAGE_UNKNOWN = "unkonwn";
+    sys.LANGUAGE_UNKNOWN = "unknown";
 
     /**
      * @memberof cc.sys

Diff for: CHANGELOG.txt

@@ -57,7 +57,7 @@ Cocos2d-x v3.7.1 @ August.12 2015
     [FIX]           web: Fixed Cocos Studio parser issue that all elements are missing while the timeline action contains rotation
 
 Cocos2d-x v3.7 Final @ July 20 2015
-    [REFINE]        web: Add compatible Uint16Array defintion
+    [REFINE]        web: Add compatible Uint16Array definition
 
     [FIX]           web: Fixed url check regular expression not supporting localhost issue
     [FIX]           web: Fixed issue that sprite doesn't update texture rect correctly 
@@ -200,7 +200,7 @@ Cocos2d-JS v3.5 @ April 1 2015
     8. Fixed a bug of Cocos Studio parser that the background color of `ccui.Layout` can't be parsed correctly.
     9. Fixed a bug of `cc.ClippingNode` that it doesn't work when set `inverted` to true in Canvas Mode.
     10. Fixed a bug of `ccs.Armature` that its name was modified to animation name when loading from json files.
-    11. Fixed a bug of `ccui.PageView` that it cancel child touch during movment of page view. 
+    11. Fixed a bug of `ccui.PageView` that it cancel child touch during movement of page view. 
     12. Fixed a bug of `cc.Scheduler` that its parameter `repeat` is invalid in schedule function.
     13. Fixed a bug of `cc.Scheduler` that `unschedule` function may fail.
 
@@ -363,7 +363,7 @@ Cocos2d-JS v3.2 RC0 @ Dec.11, 2014
 	6. Fixed an issue of `cc.ParticleSystem` that it can't change its texture mode and shape type in Canvas mode.
 	7. Fixed an issue of `cc.Layer`'s bake function that its position is incorrect when cc.view's scale isn't 1.
 	8. Fixed an issue of `ccs.ArmatureAnimation`'s `setMovementEventCallFunc` and `setFrameEventCallFunc`.
-	9. Fixed an issue of `console.log` that it isn't a funtion on IE9.
+	9. Fixed an issue of `console.log` that it isn't a function on IE9.
 	10. Fixed an issue of `CSLoader` that it will add duplicate resources to sprite frame cache.
 	11. Fixed an issue of `cc.ProgressTimer` that its setColor is not taking effect.
 	12. Fixed an issue of `cc.loader` that it will throw an error when loading a remote texture.

Diff for: cocos2d/actions/CCActionEase.js

@@ -1770,7 +1770,7 @@ cc.easeBounceOut = function(){
 
 /**
  * cc.EaseBounceInOut action. <br />
- * Eased bounce effect at the begining and ending.
+ * Eased bounce effect at the beginning and ending.
  * @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action.
  * @class
  * @extends cc.EaseBounce
@@ -1823,7 +1823,7 @@ cc.EaseBounceInOut = cc.EaseBounce.extend(/** @lends cc.EaseBounceInOut# */{
 
 /**
  * Creates the action. <br />
- * Eased bounce effect at the begining and ending.
+ * Eased bounce effect at the beginning and ending.
  * @static
  * @deprecated since v3.0 <br /> Please use action.easing(cc.easeBounceInOut())
  * @param {cc.ActionInterval} action
@@ -1857,7 +1857,7 @@ cc._easeBounceInOutObj = {
 
 /**
  * Creates the action easing object. <br />
- * Eased bounce effect at the begining and ending.
+ * Eased bounce effect at the beginning and ending.
  * @function
  * @return {Object}
  * @example
@@ -2050,7 +2050,7 @@ cc.easeBackOut = function(){
 
 /**
  * cc.EaseBackInOut action. <br />
- * Begining of cc.EaseBackIn. Ending of cc.EaseBackOut.
+ * Beginning of cc.EaseBackIn. Ending of cc.EaseBackOut.
  * @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action.
  * @class
  * @extends cc.ActionEase
@@ -2104,7 +2104,7 @@ cc.EaseBackInOut = cc.ActionEase.extend(/** @lends cc.EaseBackInOut# */{
 
 /**
  * Creates the action. <br />
- * Begining of cc.EaseBackIn. Ending of cc.EaseBackOut.
+ * Beginning of cc.EaseBackIn. Ending of cc.EaseBackOut.
  * @static
  * @param {cc.ActionInterval} action
  * @return {cc.EaseBackInOut}
@@ -2139,7 +2139,7 @@ cc._easeBackInOutObj = {
 
 /**
  * Creates the action easing object. <br />
- * Begining of cc.EaseBackIn. Ending of cc.EaseBackOut.
+ * Beginning of cc.EaseBackIn. Ending of cc.EaseBackOut.
  * @function
  * @return {Object}
  * @example

Diff for: cocos2d/core/CCActionManager.js

@@ -102,7 +102,7 @@ cc.ActionManager = cc.Class.extend(/** @lends cc.ActionManager# */{
 
         //check if the action target already exists
         var element = this._hashTargets[target.__instanceId];
-        //if doesnt exists, create a hashelement and push in mpTargets
+        //if doesn't exists, create a hashelement and push in mpTargets
         if (!element) {
             element = new cc.HashElement();
             element.paused = paused;

Diff for: cocos2d/core/base-nodes/CCNode.js

@@ -1505,7 +1505,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
         }
     },
 
-    //scene managment
+    //scene management
     /**
      * <p>
      *     Event callback that is invoked every time when CCNode enters the 'stage'.                                   <br/>

Diff for: cocos2d/core/platform/CCClass.js

@@ -75,7 +75,7 @@ var ClassManager = {
         ClassManager[classId] = _super;
         // Copy the properties over onto the new prototype. We make function
         // properties non-eumerable as this makes typeof === 'function' check
-        // unneccessary in the for...in loop used 1) for generating Class()
+        // unnecessary in the for...in loop used 1) for generating Class()
         // 2) for cc.clone and perhaps more. It is also required to make
         // these function properties cacheable in Carakan.
         var desc = { writable: true, enumerable: false, configurable: true };
@@ -269,7 +269,7 @@ cc.clone = function (obj) {
 
     // Assuming that the constuctor above initialized all properies on obj, the
     // following keyed assignments won't turn newObj into dictionary mode
-    // becasue they're not *appending new properties* but *assigning existing
+    // because they're not *appending new properties* but *assigning existing
     // ones* (note that appending indexed properties is another story). See
     // CCClass.js for a link to the devils when the assumption fails.
     for (var key in obj) {

Diff for: cocos2d/core/platform/CCCommon.js

@@ -135,7 +135,7 @@ cc.KEY = {
     '-':109,
     'numdel':110,
     '/':111,
-    f1:112, //f1-f12 dont work on ie
+    f1:112, //f1-f12 don't work on ie
     f2:113,
     f3:114,
     f4:115,
@@ -169,7 +169,7 @@ cc.KEY = {
     closebracket:221,
     quote:222,
 
-    // gamepad controll
+    // gamepad control
     dpadLeft:1000,
     dpadRight:1001,
     dpadUp:1003,

Diff for: cocos2d/core/platform/CCInputManager.js

@@ -343,7 +343,7 @@ cc.inputManager = /** @lends cc.inputManager# */{
      * @return {cc.Point}
      */
     getPointByEvent: function(event, pos){
-        if (event.pageX != null)  //not avalable in <= IE8
+        if (event.pageX != null)  //not available in <= IE8
             return {x: event.pageX, y: event.pageY};
 
         pos.left -= document.body.scrollLeft;

Diff for: cocos2d/core/platform/CCMacro.js

@@ -785,7 +785,7 @@ cc.arrayVerifyType = function (arr, type) {
 };
 
 /**
- * Searches for the first occurance of object and removes it. If object is not found the function has no effect.
+ * Searches for the first occurrence of object and removes it. If object is not found the function has no effect.
  * @function
  * @param {Array} arr Source Array
  * @param {*} delObj  remove object

Diff for: cocos2d/core/platform/CCTypes.js

@@ -44,7 +44,7 @@ cc.Color = function (r, g, b, a) {
  * Generate a color object based on multiple forms of parameters
  * @example
  *
- * // 1. All channels seperately as parameters
+ * // 1. All channels separately as parameters
  * var color1 = cc.color(255, 255, 255, 255);
  *
  * // 2. Convert a hex string to a color
@@ -345,7 +345,7 @@ cc._Dictionary = cc.Class.extend({
  * fontDef.fontSize = 12;
  * ...
  *
- * OR using inline definition usefull for constructor injection
+ * OR using inline definition useful for constructor injection
  *
  * var fontDef = new cc.FontDefinition({
  *  fontName: "Arial",

Diff for: cocos2d/core/support/CCPointExtension.js

@@ -454,7 +454,7 @@ cc.pSameAs = function (A, B) {
 
 
 
-// High Perfomance In Place Operationrs ---------------------------------------
+// High Performance In Place Operationrs ---------------------------------------
 
 /**
  * sets the position of the point to 0

Diff for: cocos2d/core/textures/TexturesWebGL.js

@@ -224,7 +224,7 @@ cc._tmp.WebGLTexture2D = function () {
         },
 
         keepData: function (data, length) {
-            //The texture data mustn't be saved becuase it isn't a mutable texture.
+            //The texture data mustn't be saved because it isn't a mutable texture.
             return data;
         },
 

Diff for: cocos2d/kazmath/gl/matrix.js

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

Diff for: cocos2d/kazmath/mat3.js

@@ -143,7 +143,7 @@ window.Float32Array = window.Float32Array || window.Array;
          m = | 1  4  7 | 1  4 |
          | 2  5  8 | 2  5 |
          now sum up the products of the diagonals going to the right (i.e. 0,4,8)
-         and substract the products of the other diagonals (i.e. 2,4,6)
+         and subtract the products of the other diagonals (i.e. 2,4,6)
          */
         var output = mat[0] * mat[4] * mat[8] + mat[1] * mat[5] * mat[6] + mat[2] * mat[3] * mat[7];
         output -= mat[2] * mat[4] * mat[6] + mat[0] * mat[5] * mat[7] + mat[1] * mat[3] * mat[8];

Diff for: cocos2d/kazmath/mat4.js

@@ -107,7 +107,7 @@
     //Returns an upper and a lower triangular matrix which are L and R in the Gauss algorithm
     cc.math.Matrix4._gaussj = function (a, b) {
         var i, icol = 0, irow = 0, j, k, l, ll, n = 4, m = 4, selElement;
-        var big, dum, pivinv;
+        var big, dumb, pivinv;
         var indxc = [0, 0, 0, 0], indxr = [0, 0, 0, 0], ipiv = [0, 0, 0, 0];
 
         /*    for (j = 0; j < n; j++) {
@@ -152,13 +152,13 @@
 
             for (ll = 0; ll < n; ll++) {
                 if (ll !== icol) {
-                    dum = a.get(ll, icol);
+                    dumb = a.get(ll, icol);
                     a.set(ll, icol, 0.0);
                     for (l = 0; l < n; l++)
-                        a.set(ll, l, a.get(ll, l) - a.get(icol, l) * dum);
+                        a.set(ll, l, a.get(ll, l) - a.get(icol, l) * dumb);
 
                     for (l = 0; l < m; l++)
-                        b.set(ll, l, a.get(ll, l) - b.get(icol, l) * dum);
+                        b.set(ll, l, a.get(ll, l) - b.get(icol, l) * dumb);
                 }
             }
         }

Diff for: cocos2d/kazmath/plane.js

@@ -81,7 +81,7 @@
          Planea = Nx
          Planeb = Ny
          Planec = Nz
-         Planed = −N⋅P
+         Planned = −N⋅P
          */
         return new cc.math.Plane(normal.x, normal.y, normal.z, -normal.dot(vec3));
     };

Diff for: cocos2d/kazmath/simd_benchmark/index.html

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

Diff for: cocos2d/particle/CCParticleSystem.js

@@ -124,7 +124,7 @@ cc.Particle.TemporaryPoints = [
  * <p>
  *     Particle System base class. <br/>
  *     Attributes of a Particle System:<br/>
- *     - emmision rate of the particles<br/>
+ *     - emission rate of the particles<br/>
  *     - Gravity Mode (Mode A): <br/>
  *     - gravity <br/>
  *     - direction <br/>

Diff for: cocos2d/render-texture/CCRenderTexture.js

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

Diff for: cocos2d/text-input/CCIMEDispatcher.js

@@ -389,7 +389,7 @@ cc.IMEDispatcher = cc.Class.extend(/**  @lends cc.imeDispatcher# */{
             this._currentInputString = delegate.string || "";
 
             var tipMessage = delegate.getTipMessage ? delegate.getTipMessage() : "please enter your word:";
-            // wechat cover the prompt funciton .So need use the Window.prototype.prompt
+            // wechat cover the prompt function .So need use the Window.prototype.prompt
             var userInput;
             if(window.Window && Window.prototype.prompt != prompt){
                 userInput = Window.prototype.prompt.call(window, tipMessage, this._currentInputString);

Diff for: cocos2d/tilemap/CCTMXTiledMap.js

@@ -72,7 +72,7 @@ cc.TMX_ORIENTATION_ISO = 2;
  *
  * <p>Limitations: <br />
  * - It only supports one tileset per layer. <br />
- * - Embeded images are not supported <br />
+ * - Embedded images are not supported <br />
  * - It only supports the XML format (the JSON format is not supported)</p>
  *
  * <p>Technical description: <br />

Diff for: cocos2d/transitions/CCTransition.js

@@ -357,7 +357,7 @@ cc.TransitionRotoZoom = cc.TransitionScene.extend(/** @lends cc.TransitionRotoZo
 });
 
 /**
- * Creates a Transtion rotation and zoom
+ * Creates a Transition rotation and zoom
  * @deprecated since v3.0,please use new cc.TransitionRotoZoom(t, scene) instead
  * @param {Number} t time in seconds
  * @param {cc.Scene} scene the scene to work with
@@ -665,7 +665,7 @@ cc.TransitionSlideInL = cc.TransitionScene.extend(/** @lends cc.TransitionSlideI
         this._inScene.setPosition(-cc.director.getWinSize().width + cc.ADJUST_FACTOR, 0);
     },
     /**
-     * returns the action that will be performed by the incomming and outgoing scene
+     * returns the action that will be performed by the incoming and outgoing scene
      * @return {cc.MoveBy}
      */
     action:function () {
@@ -721,7 +721,7 @@ cc.TransitionSlideInR = cc.TransitionSlideInL.extend(/** @lends cc.TransitionSli
         this._inScene.setPosition(cc.director.getWinSize().width - cc.ADJUST_FACTOR, 0);
     },
     /**
-     *  returns the action that will be performed by the incomming and outgoing scene
+     *  returns the action that will be performed by the incoming and outgoing scene
      * @return {cc.MoveBy}
      */
     action:function () {
@@ -771,7 +771,7 @@ cc.TransitionSlideInB = cc.TransitionSlideInL.extend(/** @lends cc.TransitionSli
     },
 
     /**
-     * returns the action that will be performed by the incomming and outgoing scene
+     * returns the action that will be performed by the incoming and outgoing scene
      * @return {cc.MoveBy}
      */
     action:function () {
@@ -821,7 +821,7 @@ cc.TransitionSlideInT = cc.TransitionSlideInL.extend(/** @lends cc.TransitionSli
     },
 
     /**
-     * returns the action that will be performed by the incomming and outgoing scene
+     * returns the action that will be performed by the incoming and outgoing scene
      * @return {cc.MoveBy}
      */
     action:function () {

Diff for: extensions/ccb-reader/CCBAnimationManager.js

@@ -606,7 +606,7 @@ cc.BuilderAnimationManager = cc.Class.extend({
         } else if (easingType === CCB_KEYFRAME_EASING_ELASTIC_INOUT) {
             return action.easing(cc.easeElasticInOut(easingOpt));
         } else {
-            cc.log("BuilderReader: Unkown easing type " + easingType);
+            cc.log("BuilderReader: Unknown easing type " + easingType);
             return action;
         }
     },

Diff for: extensions/ccui/uiwidgets/scroll-widget/UIPageView.js

@@ -27,7 +27,7 @@
  * The PageView control of Cocos UI.
  * @class
  * @extends ccui.Layout
- * @exmaple
+ * @example
  * var pageView = new ccui.PageView();
  * pageView.setTouchEnabled(true);
  * pageView.addPage(new ccui.Layout());

Diff for: extensions/cocostudio/timeline/Frame.js

@@ -746,7 +746,7 @@ ccs.PositionFrame = ccs.Frame.extend({
     },
 
     /**
-     * Gets the postion x
+     * Gets the position x
      * @returns {Number}
      */
     getX: function(){

Diff for: extensions/editbox/CCdomNode.js

@@ -596,7 +596,7 @@ cc.DOM.forSprite = function (x) {
  * @param x
  */
 cc.DOM.placeHolder = function (x) {
-    //creating a placeholder dom to simulate other ccNode in the hierachy
+    //creating a placeholder dom to simulate other ccNode in the hierarchy
     x.dom = cc.$new('div');
     x.placeholder = true;
     x.dom.style.position = 'absolute';