From b9b350a96296581102220aa9e1d4b5de687f47b7 Mon Sep 17 00:00:00 2001
From: andrey <akargapolov@gmail.com>
Date: Thu, 16 Nov 2017 15:53:02 +0500
Subject: [PATCH] fix ie set timeout

---
 CCBoot.js                          | 3 ++-
 cocos2d/audio/CCAudio.js           | 1 +
 cocos2d/core/utils/BinaryLoader.js | 1 +
 extensions/ccb-reader/CCBReader.js | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CCBoot.js b/CCBoot.js
index ebe862bedb..bc7cd5444b 100644
--- a/CCBoot.js
+++ b/CCBoot.js
@@ -651,7 +651,6 @@ 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;
             }
@@ -792,6 +791,7 @@ cc.loader = (function () {
                 var xhr = this.getXMLHttpRequest(),
                     errInfo = "load " + url + " failed!";
                 xhr.open("GET", url, true);
+                xhr.timeout = 10000;
                 if (/msie/i.test(navigator.userAgent) && !/opera/i.test(navigator.userAgent)) {
                     // IE-specific logic here
                     xhr.setRequestHeader("Accept-Charset", "utf-8");
@@ -860,6 +860,7 @@ cc.loader = (function () {
             var xhr = cc.loader.getXMLHttpRequest(),
                 errInfo = "load " + url + " failed!";
             xhr.open("GET", url, true);
+            xhr.timeout = 10000;
             xhr.responseType = "arraybuffer";
 
             var loadCallback = function () {
diff --git a/cocos2d/audio/CCAudio.js b/cocos2d/audio/CCAudio.js
index 7762bf4d02..1a2df21941 100644
--- a/cocos2d/audio/CCAudio.js
+++ b/cocos2d/audio/CCAudio.js
@@ -383,6 +383,7 @@ cc.Audio.WebAudio.prototype = {
 
             var request = cc.loader.getXMLHttpRequest();
             request.open("GET", url, true);
+            request.timeout = 10000;
             request.responseType = "arraybuffer";
 
             // Our asynchronous callback
diff --git a/cocos2d/core/utils/BinaryLoader.js b/cocos2d/core/utils/BinaryLoader.js
index 46b82b65cf..8455037add 100644
--- a/cocos2d/core/utils/BinaryLoader.js
+++ b/cocos2d/core/utils/BinaryLoader.js
@@ -37,6 +37,7 @@ cc.loader.loadBinary = function (url, cb) {
     var xhr = this.getXMLHttpRequest(),
         errInfo = "load " + url + " failed!";
     xhr.open("GET", url, true);
+    xhr.timeout = 10000;
     xhr.responseType = 'arraybuffer';
     if (cc.loader.loadBinary._IEFilter) {
         // IE-specific logic here
diff --git a/extensions/ccb-reader/CCBReader.js b/extensions/ccb-reader/CCBReader.js
index 0baa27b4ca..bfc0f1ff93 100644
--- a/extensions/ccb-reader/CCBReader.js
+++ b/extensions/ccb-reader/CCBReader.js
@@ -203,6 +203,7 @@ cc.BuilderReader = cc.Class.extend({
         var req = this.getXMLHttpRequest();
         var errInfo = "load " + url + " failed!";
         req.open('GET', url, false);
+        req.timeout = 10000;
         var arrayInfo = null;
         if (/msie/i.test(navigator.userAgent) && !/opera/i.test(navigator.userAgent)) {
             req.setRequestHeader("Accept-Charset", "x-user-defined");