Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2698_namespace

Author: dingpinglv

CCBoot.js

@@ -282,7 +282,7 @@ cc._formatString = function (arg) {
  */
 cc._initDebugSetting = function (mode) {
     var ccGame = cc.game;
-    if(mode == ccGame.DEBUG_MODE_NONE)
+    if(mode === ccGame.DEBUG_MODE_NONE)
         return;
 
     var locLog;
@@ -299,12 +299,12 @@ cc._initDebugSetting = function (mode) {
                 locLog("Assert: " + msg);
             }
         };
-        if(mode != ccGame.DEBUG_MODE_ERROR_FOR_WEB_PAGE){
+        if(mode !== ccGame.DEBUG_MODE_ERROR_FOR_WEB_PAGE){
             cc.warn = function(){
                 locLog("WARN :  " + cc.formatStr.apply(cc, arguments));
             };
         }
-        if(mode == ccGame.DEBUG_MODE_INFO_FOR_WEB_PAGE){
+        if(mode === ccGame.DEBUG_MODE_INFO_FOR_WEB_PAGE){
             cc.log = function(){
                 locLog(cc.formatStr.apply(cc, arguments));
             };
@@ -322,11 +322,11 @@ cc._initDebugSetting = function (mode) {
                 throw msg;
             }
         };
-        if(mode != ccGame.DEBUG_MODE_ERROR)
+        if(mode !== ccGame.DEBUG_MODE_ERROR)
             cc.warn = function(){
                 return console.warn.apply(console, arguments);
             };
-        if(mode == ccGame.DEBUG_MODE_INFO)
+        if(mode === ccGame.DEBUG_MODE_INFO)
             cc.log = function(){
                 return console.log.apply(console, arguments);
             };

CCDebugger.js

@@ -16,7 +16,15 @@ Documentation
    * Website: [www.cocos2d-x.org][3]
    * API References: [http://www.cocos2d-x.org/wiki/Reference] [4]
 
-Running the tests
+
+Installing from [bower][8] (version >=3.4)
+------------------
+
+```shell
+$ bower install cocos2d-html5
+```
+
+Running the tests (version <3)
 ------------------
 
 ```shell
@@ -41,3 +49,4 @@ Contact us
 [5]: http://forum.cocos2d-x.org "http://forum.cocos2d-x.org"
 [6]: http://www.twitter.com/cocos2dhtml5 "http://www.twitter.com/cocos2dhtml5"
 [7]: http://t.sina.com.cn/cocos2dhtml5 "http://t.sina.com.cn/cocos2dhtml5"
+[8]: http://bower.io "http://bower.io"

README.mdown

@@ -0,0 +1,37 @@
+{
+  "name": "cocos2d-html5",
+  "version": "3.4",
+  "homepage": "http://www.cocos2d-x.org",
+  "authors": [
+    "AUTHORS.txt"
+  ],
+  "description": "Cocos2d-html5 is a cross-platform 2D game engine written in Javascript, based on Cocos2d-X and licensed under MIT. It incorporates the same high level api as “Cocos2d JS-binding engine” and compatible with Cocos2d-X. It currently supports canvas and WebGL renderering.",
+  "main": "README.mdown",
+  "keywords": [
+    "cocos2d-x",
+    "cocos2d",
+    "game",
+    "engine",
+    "opengl",
+    "cross",
+    "multi",
+    "platform",
+    "iphone",
+    "ipad",
+    "android",
+    "windows",
+    "metro",
+    "bada",
+    "marmalade",
+    "playbook"
+  ],
+  "license": "MIT",
+  "private": false,
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ]
+}

bower.json

@@ -422,7 +422,7 @@ cc.Speed = cc.Action.extend(/** @lends cc.Speed# */{
      * @param {cc.ActionInterval} action
      */
     setInnerAction:function (action) {
-        if (this._innerAction != action) {
+        if (this._innerAction !== action) {
             this._innerAction = action;
         }
     },
@@ -607,7 +607,7 @@ cc.Follow = cc.Action.extend(/** @lends cc.Follow# */{
                 _this.topBoundary = _this.bottomBoundary = (_this.topBoundary + _this.bottomBoundary) / 2;
             }
 
-            if ((_this.topBoundary == _this.bottomBoundary) && (_this.leftBoundary == _this.rightBoundary))
+            if ((_this.topBoundary === _this.bottomBoundary) && (_this.leftBoundary === _this.rightBoundary))
                 _this._boundaryFullyCovered = true;
         }
         return true;

cocos2d/actions/CCAction.js

@@ -174,7 +174,7 @@ cc.CardinalSplineTo = cc.ActionInterval.extend(/** @lends cc.CardinalSplineTo# *
      * @return {Boolean}
      */
     initWithDuration:function (duration, points, tension) {
-        if(!points || points.length == 0)
+        if(!points || points.length === 0)
             throw "Invalid configuration. It must at least have one control point";
 
         if (cc.ActionInterval.prototype.initWithDuration.call(this, duration)) {
@@ -222,7 +222,7 @@ cc.CardinalSplineTo = cc.ActionInterval.extend(/** @lends cc.CardinalSplineTo# *
         // p..p..p..p..p..p..p
         // 1..2..3..4..5..6..7
         // want p to be 1, 2, 3, 4, 5, 6
-        if (dt == 1) {
+        if (dt === 1) {
             p = ps.length - 1;
             lt = 1;
         } else {
@@ -242,7 +242,7 @@ cc.CardinalSplineTo = cc.ActionInterval.extend(/** @lends cc.CardinalSplineTo# *
             var tempX, tempY;
             tempX = this.target.getPositionX() - this._previousPosition.x;
             tempY = this.target.getPositionY() - this._previousPosition.y;
-            if (tempX != 0 || tempY != 0) {
+            if (tempX !== 0 || tempY !== 0) {
                 var locAccDiff = this._accumulatedDiff;
                 tempX = locAccDiff.x + tempX;
                 tempY = locAccDiff.y + tempY;

cocos2d/actions/CCActionCatmullRom.js

@@ -651,7 +651,7 @@ cc.EaseExponentialOut = cc.ActionEase.extend(/** @lends cc.EaseExponentialOut# *
      * @param {Number} dt
      */
     update:function (dt) {
-        this._inner.update(dt == 1 ? 1 : (-(Math.pow(2, -10 * dt)) + 1));
+        this._inner.update(dt === 1 ? 1 : (-(Math.pow(2, -10 * dt)) + 1));
     },
 
     /**
@@ -696,7 +696,7 @@ cc.EaseExponentialOut.create = function (action) {
 
 cc._easeExponentialOutObj = {
     easing: function(dt){
-        return dt == 1 ? 1 : (-(Math.pow(2, -10 * dt)) + 1);
+        return dt === 1 ? 1 : (-(Math.pow(2, -10 * dt)) + 1);
     },
     reverse: function(){
         return cc._easeExponentialInObj;
@@ -740,7 +740,7 @@ cc.EaseExponentialInOut = cc.ActionEase.extend(/** @lends cc.EaseExponentialInOu
      * @param {Number} dt
      */
     update:function (dt) {
-        if( dt != 1 && dt !== 0) {
+        if( dt !== 1 && dt !== 0) {
             dt *= 2;
             if (dt < 1)
                 dt = 0.5 * Math.pow(2, 10 * (dt - 1));
@@ -976,7 +976,7 @@ cc.EaseSineOut.create = function (action) {
 
 cc._easeSineOutObj = {
     easing: function(dt){
-        return (dt===0 || dt==1) ? dt : Math.sin(dt * Math.PI / 2);
+        return (dt===0 || dt===1) ? dt : Math.sin(dt * Math.PI / 2);
     },
     reverse: function(){
         return cc._easeSineInObj;
@@ -1313,7 +1313,7 @@ cc.EaseElasticOut = cc.EaseElastic.extend(/** @lends cc.EaseElasticOut# */{
      */
     update:function (dt) {
         var newT = 0;
-        if (dt === 0 || dt == 1) {
+        if (dt === 0 || dt === 1) {
             newT = dt;
         } else {
             var s = this._period / 4;
@@ -1423,7 +1423,7 @@ cc.EaseElasticInOut = cc.EaseElastic.extend(/** @lends cc.EaseElasticInOut# */{
     update:function (dt) {
         var newT = 0;
         var locPeriod = this._period;
-        if (dt === 0 || dt == 1) {
+        if (dt === 0 || dt === 1) {
             newT = dt;
         } else {
             dt = dt * 2;
@@ -1891,7 +1891,7 @@ cc.EaseBackIn = cc.ActionEase.extend(/** @lends cc.EaseBackIn# */{
      */
     update:function (dt) {
         var overshoot = 1.70158;
-        dt = dt===0 || dt==1 ? dt : dt * dt * ((overshoot + 1) * dt - overshoot);
+        dt = dt===0 || dt===1 ? dt : dt * dt * ((overshoot + 1) * dt - overshoot);
         this._inner.update(dt);
     },
 

cocos2d/actions/CCActionEase.js

@@ -701,7 +701,7 @@ cc.CallFunc = cc.ActionInstant.extend(/** @lends cc.CallFunc# */{
      * @param {object} sel
      */
     setTargetCallback:function (sel) {
-        if (sel != this._selectorTarget) {
+        if (sel !== this._selectorTarget) {
             if (this._selectorTarget)
                 this._selectorTarget = null;
             this._selectorTarget = sel;

cocos2d/actions/CCActionInstant.js

@@ -669,7 +669,7 @@ cc.Repeat = cc.ActionInterval.extend(/** @lends cc.Repeat# */{
      * @return {Boolean}
      */
     isDone:function () {
-        return this._total == this._times;
+        return this._total === this._times;
     },
 
     /**
@@ -688,7 +688,7 @@ cc.Repeat = cc.ActionInterval.extend(/** @lends cc.Repeat# */{
      * @param {cc.FiniteTimeAction} action
      */
     setInnerAction:function (action) {
-        if (this._innerAction != action) {
+        if (this._innerAction !== action) {
             this._innerAction = action;
         }
     },
@@ -826,7 +826,7 @@ cc.RepeatForever = cc.ActionInterval.extend(/** @lends cc.RepeatForever# */{
      * @param {cc.ActionInterval} action
      */
     setInnerAction:function (action) {
-        if (this._innerAction != action) {
+        if (this._innerAction !== action) {
             this._innerAction = action;
         }
     },
@@ -3166,7 +3166,7 @@ cc.ReverseTime = cc.ActionInterval.extend(/** @lends cc.ReverseTime# */{
     initWithAction:function (action) {
         if(!action)
             throw "cc.ReverseTime.initWithAction(): action must be non null";
-        if(action == this._other)
+        if(action === this._other)
             throw "cc.ReverseTime.initWithAction(): the action was already passed in.";
 
         if (cc.ActionInterval.prototype.initWithDuration.call(this, action._duration)) {
@@ -3527,7 +3527,7 @@ cc.TargetedAction = cc.ActionInterval.extend(/** @lends cc.TargetedAction# */{
      * @param {cc.Node} forcedTarget
      */
     setForcedTarget:function (forcedTarget) {
-        if (this._forcedTarget != forcedTarget)
+        if (this._forcedTarget !== forcedTarget)
             this._forcedTarget = forcedTarget;
     }
 });

cocos2d/actions/CCActionInterval.js

@@ -73,7 +73,7 @@ cc.GridAction = cc.ActionInterval.extend(/** @lends cc.GridAction# */{
         var targetGrid = t.grid;
         if (targetGrid && targetGrid.getReuseGrid() > 0) {
             var locGridSize = targetGrid.getGridSize();
-            if (targetGrid.isActive() && (locGridSize.width == this._gridSize.width) && (locGridSize.height == this._gridSize.height))
+            if (targetGrid.isActive() && (locGridSize.width === this._gridSize.width) && (locGridSize.height === this._gridSize.height))
                 targetGrid.reuse();
         } else {
             if (targetGrid && targetGrid.isActive())

cocos2d/actions3d/CCActionGrid.js

@@ -184,7 +184,7 @@ cc.FlipX3D = cc.Grid3DAction.extend(/** @lends cc.FlipX3D# */{
      * @return {Boolean}
      */
     initWithSize:function (gridSize, duration) {
-        if (gridSize.width != 1 || gridSize.height != 1) {
+        if (gridSize.width !== 1 || gridSize.height !== 1) {
             // Grid size must be (1,1)
             cc.log("Grid size must be (1,1)");
             return false;
@@ -516,7 +516,7 @@ cc.Lens3D = cc.Grid3DAction.extend(/** @lends cc.Lens3D# */{
                     if (r < locRadius) {
                         r = locRadius - r;
                         pre_log = r / locRadius;
-                        if (pre_log == 0)
+                        if (pre_log === 0)
                             pre_log = 0.001;
 
                         l = Math.log(pre_log) * locLensEffect;

cocos2d/actions3d/CCActionGrid3D.js

@@ -457,7 +457,7 @@ cc.FadeOutTRTiles = cc.TiledGrid3DAction.extend(/** @lends cc.FadeOutTRTiles# */
     testFunc:function (pos, time) {
         var locX = this._gridSize.width * time;
         var locY = this._gridSize.height * time;
-        if ((locX + locY) == 0.0)
+        if ((locX + locY) === 0.0)
             return 1.0;
         return Math.pow((pos.width + pos.height) / (locX + locY), 6);
     },
@@ -516,7 +516,7 @@ cc.FadeOutTRTiles = cc.TiledGrid3DAction.extend(/** @lends cc.FadeOutTRTiles# */
                 locSize.width = i;
                 locSize.height = j;
                 distance = this.testFunc(locSize, dt);
-                if (distance == 0)
+                if (distance === 0)
                     this.turnOffTile(locPos);
                 else if (distance < 1)
                     this.transformTile(locPos, distance);
@@ -566,7 +566,7 @@ cc.FadeOutBLTiles = cc.FadeOutTRTiles.extend(/** @lends cc.FadeOutBLTiles# */{
     testFunc:function (pos, time) {
         var locX = this._gridSize.width * (1.0 - time);
         var locY = this._gridSize.height * (1.0 - time);
-        if ((pos.width + pos.height) == 0)
+        if ((pos.width + pos.height) === 0)
             return 1.0;
 
         return Math.pow((locX + locY) / (pos.width + pos.height), 6);
@@ -606,7 +606,7 @@ cc.FadeOutBLTiles.create = cc.fadeOutBLTiles;
 cc.FadeOutUpTiles = cc.FadeOutTRTiles.extend(/** @lends cc.FadeOutUpTiles# */{
     testFunc:function (pos, time) {
         var locY = this._gridSize.height * time;
-        if (locY == 0.0)
+        if (locY === 0.0)
             return 1.0;
         return Math.pow(pos.height / locY, 6);
     },
@@ -657,7 +657,7 @@ cc.FadeOutUpTiles.create = cc.fadeOutUpTiles;
 cc.FadeOutDownTiles = cc.FadeOutUpTiles.extend(/** @lends cc.FadeOutDownTiles# */{
     testFunc:function (pos, time) {
         var locY = this._gridSize.height * (1.0 - time);
-        if (pos.height == 0)
+        if (pos.height === 0)
             return 1.0;
         return Math.pow(locY / pos.height, 6);
     }
@@ -1057,7 +1057,7 @@ cc.JumpTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.JumpTiles3D# */{
                 //var coords = this.originalTile(cc.p(i, j));
                 coords = locGrid.originalTile(locPos);
 
-                if (((i + j) % 2) == 0) {
+                if (((i + j) % 2) === 0) {
                     coords.bl.z += sinz;
                     coords.br.z += sinz;
                     coords.tl.z += sinz;
@@ -1150,7 +1150,7 @@ cc.SplitRows = cc.TiledGrid3DAction.extend(/** @lends cc.SplitRows# */{
             coords = this.originalTile(locPos);
             direction = 1;
 
-            if ((j % 2 ) == 0)
+            if ((j % 2 ) === 0)
                 direction = -1;
 
             coords.bl.x += direction * locWinSizeWidth * dt;
@@ -1241,7 +1241,7 @@ cc.SplitCols = cc.TiledGrid3DAction.extend(/** @lends cc.SplitCols# */{
             coords = this.originalTile(locPos);
             direction = 1;
 
-            if ((i % 2 ) == 0)
+            if ((i % 2 ) === 0)
                 direction = -1;
 
             coords.bl.y += direction * locWinSizeHeight * dt;