From 2a3b38b9d0d4083f1da95d99930d0205d98f31c2 Mon Sep 17 00:00:00 2001 From: mkendall07 Date: Mon, 24 Jul 2017 13:08:22 -0400 Subject: [PATCH 1/2] fix 1410 - issue with ie and xhr.timeout --- src/ajax.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ajax.js b/src/ajax.js index dc1f8ecb6a8..7c7a051e76d 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -46,7 +46,6 @@ export function ajax(url, callback, data, options = {}) { } } - x.timeout = _timeout; if (useXDomainRequest) { x = new window.XDomainRequest(); x.onload = function () { @@ -83,6 +82,8 @@ export function ajax(url, callback, data, options = {}) { } x.open(method, url); + // IE needs timoeut to be set after open + x.timeout = _timeout; if (!useXDomainRequest) { if (options.withCredentials) { From ddf2a42afbf19c6cf51bf6508f2b3525a40d68cc Mon Sep 17 00:00:00 2001 From: mkendall07 Date: Mon, 24 Jul 2017 13:47:31 -0400 Subject: [PATCH 2/2] update comment --- src/ajax.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ajax.js b/src/ajax.js index 7c7a051e76d..ac6f08c09ca 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -82,7 +82,7 @@ export function ajax(url, callback, data, options = {}) { } x.open(method, url); - // IE needs timoeut to be set after open + // IE needs timoeut to be set after open - see #1410 x.timeout = _timeout; if (!useXDomainRequest) {