CodeMirror/uMatrix
1
0
Fork 0
mirror of https://github.com/gorhill/uMatrix.git synced 2024-06-30 03:50:41 +12:00
Code Issues Releases Wiki Activity

this addresses https://github.com/gorhill/uBlock/issues/724

Browse source
This commit is contained in:
gorhill 2015-09-26 11:10:10 -04:00
parent 50189a450f
commit 3c1419ad3b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/js/assets.js
View file

@ -61,6 +61,7 @@ var lastRepoMetaTimestamp = 0;
var lastRepoMetaIsRemote = false; var lastRepoMetaIsRemote = false;
var refreshRepoMetaPeriod = 5 * oneHour; var refreshRepoMetaPeriod = 5 * oneHour;
var errorCantConnectTo = vAPI.i18n('errorCantConnectTo'); var errorCantConnectTo = vAPI.i18n('errorCantConnectTo');
var xhrTimeout = vAPI.localStorage.getItem('xhrTimeout') || 30000;
var exports = { var exports = {
autoUpdate: true, autoUpdate: true,
@ -318,7 +319,7 @@ var getTextFileFromURL = function(url, onLoad, onError) {
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
try { try {
xhr.open('get', url, true); xhr.open('get', url, true);
xhr.timeout = 30000; xhr.timeout = xhrTimeout;
xhr.onload = onResponseReceived; xhr.onload = onResponseReceived;
xhr.onerror = onErrorReceived; xhr.onerror = onErrorReceived;
xhr.ontimeout = onErrorReceived; xhr.ontimeout = onErrorReceived;