Skip to content

Commit 2a10b9c

Browse files
committed
update uxhr to prevent setting timeout on sync requests
1 parent 45c31e0 commit 2a10b9c

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"bower_components"
1616
],
1717
"dependencies" : {
18-
"uxhr": "endel/uxhr#b74710a1d54ed44cf3ad94daeed1c21e424095df",
18+
"uxhr": "endel/uxhr#a484e430e224375b786072da5abb94dfd3c68685",
1919
"qunit": "~1.9.0",
2020
"when": "~2.8.0",
2121
"lodash": "~2.4.0",

dist/amd/dl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* https://github.com/doubleleft/dl-api-javascript
44
*
55
* @copyright 2014 Doubleleft
6-
* @build 6/24/2014
6+
* @build 6/26/2014
77
*/
88
(function(define) { 'use strict';
99
define(function (require) {

dist/dl.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* https://github.com/doubleleft/dl-api-javascript
44
*
55
* @copyright 2014 Doubleleft
6-
* @build 6/24/2014
6+
* @build 6/26/2014
77
*/
88
(function(window) {
99
//
@@ -1028,9 +1028,12 @@ define(function (require) {
10281028
req.open(method, url, !sync);
10291029

10301030
// set timeout
1031-
if ('ontimeout' in req) {
1032-
req.timeout = timeout;
1033-
req.ontimeout = ontimeout;
1031+
// timeouts cannot be set for synchronous requests made from a document.
1032+
if (!sync) {
1033+
if ('ontimeout' in req) {
1034+
req.timeout = timeout;
1035+
req.ontimeout = ontimeout;
1036+
}
10341037
}
10351038

10361039
// set onprogress
@@ -7849,7 +7852,7 @@ define(function (require) {
78497852
}.call(this));
78507853

78517854
!function(a){"use strict";var b=a.HTMLCanvasElement&&a.HTMLCanvasElement.prototype,c=a.Blob&&function(){try{return Boolean(new Blob)}catch(a){return!1}}(),d=c&&a.Uint8Array&&function(){try{return 100===new Blob([new Uint8Array(100)]).size}catch(a){return!1}}(),e=a.BlobBuilder||a.WebKitBlobBuilder||a.MozBlobBuilder||a.MSBlobBuilder,f=(c||e)&&a.atob&&a.ArrayBuffer&&a.Uint8Array&&function(a){var b,f,g,h,i,j;for(b=a.split(",")[0].indexOf("base64")>=0?atob(a.split(",")[1]):decodeURIComponent(a.split(",")[1]),f=new ArrayBuffer(b.length),g=new Uint8Array(f),h=0;h<b.length;h+=1)g[h]=b.charCodeAt(h);return i=a.split(",")[0].split(":")[1].split(";")[0],c?new Blob([d?g:f],{type:i}):(j=new e,j.append(f),j.getBlob(i))};a.HTMLCanvasElement&&!b.toBlob&&(b.mozGetAsFile?b.toBlob=function(a,c,d){d&&b.toDataURL&&f?a(f(this.toDataURL(c,d))):a(this.mozGetAsFile("blob",c))}:b.toDataURL&&f&&(b.toBlob=function(a,b,c){a(f(this.toDataURL(b,c)))})),"function"==typeof define&&define.amd?define(function(){return f}):a.dataURLtoBlob=f}(this);
7852-
/** @license
7855+
/**
78537856
* eventsource.js
78547857
* Available under MIT License (MIT)
78557858
* https://github.com/Yaffle/EventSource/
@@ -8114,7 +8117,7 @@ define(function (require) {
81148117
} else if (field === "retry") {
81158118
initialRetry = getDuration(value, initialRetry);
81168119
retry = initialRetry;
8117-
} else if (field === "heartbeatTimeout") {
8120+
} else if (field === "heartbeatTimeout") {//!
81188121
heartbeatTimeout = getDuration(value, heartbeatTimeout);
81198122
if (timeout !== 0) {
81208123
clearTimeout(timeout);

dist/dl.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)