Merge pull request #3418 from pandamicro/develop

Fix issues

Author: pandamicro

CCBoot.js

@@ -623,6 +623,9 @@ cc.loader = (function () {
         getXMLHttpRequest: function () {
             var xhr = window.XMLHttpRequest ? new window.XMLHttpRequest() : new ActiveXObject("MSXML2.XMLHTTP");
             xhr.timeout = 10000;
+            if (xhr.ontimeout === undefined) {
+                xhr._timeoutId = -1;
+            }
             return xhr;
         },
 
@@ -770,12 +773,24 @@ cc.loader = (function () {
                 } else {
                     if (xhr.overrideMimeType) xhr.overrideMimeType("text\/plain; charset=utf-8");
                     xhr.onload = function () {
-                        if (xhr.readyState === 4)
+                        if (xhr._timeoutId >= 0) {
+                            clearTimeout(xhr._timeoutId);
+                        }
+                        if (xhr.readyState === 4) {
                             xhr.status === 200 ? cb(null, xhr.responseText) : cb({status:xhr.status, errorMessage:errInfo}, null);
+                        }
                     };
-                    xhr.onerror = xhr.ontimeout = function () {
+                    xhr.onerror = function () {
                         cb({status: xhr.status, errorMessage: errInfo}, null);
                     };
+                    if (xhr.ontimeout === undefined) {
+                        xhr._timeoutId = setTimeout(function () {
+                            xhr.ontimeout();
+                        }, xhr.timeout);
+                    }
+                    xhr.ontimeout = function () {
+                        cb({status: xhr.status, errorMessage: "Request timeout: " + errInfo}, null);
+                    };
                 }
                 xhr.send(null);
             } else {
@@ -787,22 +802,34 @@ cc.loader = (function () {
         },
 
         loadCsb: function(url, cb){
-            var xhr = new XMLHttpRequest(),
+            var xhr = cc.loader.getXMLHttpRequest(),
                 errInfo = "load " + url + " failed!";
             xhr.open("GET", url, true);
             xhr.responseType = "arraybuffer";
 
             xhr.onload = function () {
+                if (xhr._timeoutId >= 0) {
+                    clearTimeout(xhr._timeoutId);
+                }
                 var arrayBuffer = xhr.response; // Note: not oReq.responseText
                 if (arrayBuffer) {
                     window.msg = arrayBuffer;
                 }
-                if(xhr.readyState === 4)
+                if (xhr.readyState === 4) {
                     xhr.status === 200 ? cb(null, xhr.response) : cb({status:xhr.status, errorMessage:errInfo}, null);
+                }
             };
-            xhr.onerror = xhr.ontimeout = function(){
+            xhr.onerror = function(){
                 cb({status:xhr.status, errorMessage:errInfo}, null);
             };
+            if (xhr.ontimeout === undefined) {
+                xhr._timeoutId = setTimeout(function () {
+                    xhr.ontimeout();
+                }, xhr.timeout);
+            }
+            xhr.ontimeout = function () {
+                cb({status: xhr.status, errorMessage: "Request timeout: " + errInfo}, null);
+            };
             xhr.send(null);
         },
 
@@ -2650,8 +2677,7 @@ cc.game = /** @lends cc.game# */{
             this._renderContext = cc._renderContext = cc.webglContext
              = cc.create3DContext(localCanvas, {
                 'stencil': true,
-                'alpha': false,
-                'preserveDrawingBuffer': false
+                'alpha': false
             });
         }
         // WebGL context created successfully

CCDebugger.js

@@ -68,7 +68,8 @@ cc._LogInfos = {
     Node_resumeSchedulerAndActions: "resumeSchedulerAndActions is deprecated, please use resume instead.",
     Node_pauseSchedulerAndActions: "pauseSchedulerAndActions is deprecated, please use pause instead.",
     Node__arrayMakeObjectsPerformSelector: "Unknown callback function",
-    Node_reorderChild: "child must be non-null",
+    Node_reorderChild: "cc.Node.reorderChild(): child must be non-null",
+    Node_reorderChild_2: "cc.Node.reorderChild(): this child is not in children list",
     Node_runAction: "cc.Node.runAction(): action must be non-null",
     Node_schedule: "callback function must be non-null",
     Node_schedule_2: "interval must be positive",
@@ -119,7 +120,6 @@ cc._LogInfos = {
     animationCache__parseVersion2_2: "cocos2d: cc.AnimationCache: Animation '%s' refers to frame '%s' which is not currently in the cc.SpriteFrameCache. This frame will not be added to the animation.",
     animationCache_addAnimations_2: "cc.AnimationCache.addAnimations(): Invalid texture file name",
 
-    Sprite_reorderChild: "cc.Sprite.reorderChild(): this child is not in children list",
     Sprite_ignoreAnchorPointForPosition: "cc.Sprite.ignoreAnchorPointForPosition(): it is invalid in cc.Sprite when using SpriteBatchNode",
     Sprite_setDisplayFrameWithAnimationName: "cc.Sprite.setDisplayFrameWithAnimationName(): Frame not found",
     Sprite_setDisplayFrameWithAnimationName_2: "cc.Sprite.setDisplayFrameWithAnimationName(): Invalid frame index",
@@ -130,7 +130,6 @@ cc._LogInfos = {
     Sprite_initWithSpriteFrameName1: " is null, please check.",
     Sprite_initWithFile: "cc.Sprite.initWithFile(): filename should be non-null",
     Sprite_setDisplayFrameWithAnimationName_3: "cc.Sprite.setDisplayFrameWithAnimationName(): animationName must be non-null",
-    Sprite_reorderChild_2: "cc.Sprite.reorderChild(): child should be non-null",
     Sprite_addChild: "cc.Sprite.addChild(): cc.Sprite only supports cc.Sprites as children when using cc.SpriteBatchNode",
     Sprite_addChild_2: "cc.Sprite.addChild(): cc.Sprite only supports a sprite using same texture as children when using cc.SpriteBatchNode",
     Sprite_addChild_3: "cc.Sprite.addChild(): child should be non-null",

cocos2d/audio/CCAudio.js

@@ -359,12 +359,15 @@ cc.Audio.WebAudio.prototype = {
         loadBuffer: function (url, cb) {
             if (!SWA) return; // WebAudio Buffer
 
-            var request = new XMLHttpRequest();
+            var request = cc.loader.getXMLHttpRequest();
             request.open("GET", url, true);
             request.responseType = "arraybuffer";
 
             // Our asynchronous callback
             request.onload = function () {
+                if (request._timeoutId >= 0) {
+                    clearTimeout(request._timeoutId);
+                }
                 context["decodeAudioData"](request.response, function (buffer) {
                     //success
                     cb(null, buffer);
@@ -378,6 +381,11 @@ cc.Audio.WebAudio.prototype = {
             request.onerror = function () {
                 cb('request error - ' + url);
             };
+            if (request.ontimeout === undefined) {
+                request._timeoutId = setTimeout(function () {
+                    request.ontimeout();
+                }, request.timeout);
+            }
             request.ontimeout = function () {
                 cb('request timeout - ' + url);
             };

cocos2d/core/CCDirectorWebGL.js

@@ -160,11 +160,6 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
             cc.eventManager.setEnabled(true);
     };
 
-    _p._clear = function () {
-        var gl = cc._renderContext;
-        gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
-    };
-
     _p.getVisibleSize = function () {
         //if (this._openGLView) {
         return this._openGLView.getVisibleSize();

cocos2d/core/base-nodes/CCNode.js

@@ -1360,6 +1360,13 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      */
     reorderChild: function (child, zOrder) {
         cc.assert(child, cc._LogInfos.Node_reorderChild);
+        if (this._children.indexOf(child) === -1) {
+            cc.log(cc._LogInfos.Node_reorderChild_2);
+            return;
+        }
+        if (zOrder === child.zIndex) {
+            return;
+        }
         cc.renderer.childrenOrderDirty = this._reorderChildDirty = true;
         child.arrivalOrder = cc.s_globalOrderOfArrival;
         cc.s_globalOrderOfArrival++;

cocos2d/core/layers/CCLayer.js

@@ -74,7 +74,7 @@ cc.Layer = cc.Node.extend(/** @lends cc.Layer# */{
         return this._renderCmd._isBaked;
     },
 
-    visit: function () {
+    visit: function (parent) {
         // quick return if not visible
         if (!this._visible)
             return;

cocos2d/core/layers/CCLayerCanvasRenderCmd.js

@@ -275,13 +275,13 @@
                     for (i = 0; i < len; i++) {
                         child = children[i];
                         if (child._localZOrder < 0)
-                            child._renderCmd.visit(this);
+                            child.visit(node);
                         else
                             break;
                     }
                     cc.renderer.pushRenderCommand(this);
                     for (; i < len; i++) {
-                        children[i]._renderCmd.visit(this);
+                        children[i].visit(node);
                     }
                 } else
                     cc.renderer.pushRenderCommand(this);