Skip to content

fix ie set timeout #3540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix ie set timeout #3540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CCBoot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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 () {
Expand Down
1 change: 1 addition & 0 deletions cocos2d/audio/CCAudio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions cocos2d/core/utils/BinaryLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions extensions/ccb-reader/CCBReader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down