web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix infinite loading screen caused by some browser settings

Browse Source
This commit is contained in:
yflory 2018-06-28 16:13:52 +02:00
parent 76c9b01d45
commit a537f7de8b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
www/common/cryptpad-common.js
View File

@ -907,6 +907,7 @@ define([
var msgEv = Util.mkEvent(); var msgEv = Util.mkEvent();
var postMsg, worker; var postMsg, worker;
var noWorker = AppConfig.disableWorkers || false; var noWorker = AppConfig.disableWorkers || false;
var noSharedWorker = false;
if (localStorage.CryptPad_noWorkers) { if (localStorage.CryptPad_noWorkers) {
noWorker = localStorage.CryptPad_noWorkers === '1'; noWorker = localStorage.CryptPad_noWorkers === '1';
console.error('WebWorker/SharedWorker state forced to ' + !noWorker); console.error('WebWorker/SharedWorker state forced to ' + !noWorker);
@ -927,8 +928,17 @@ define([
} }
}; };
} }
if (typeof(SharedWorker) !== "undefined") {
try {
new SharedWorker('');
catch (e) {
noSharedWorker = true;
e = e;
console.log('Disabling SharedWorker because of privacy settings.');
}
}
}).nThen(function (waitFor2) { }).nThen(function (waitFor2) {
if (!noWorker && typeof(SharedWorker) !== "undefined") { if (!noWorker && !noSharedWorker && typeof(SharedWorker) !== "undefined") {
worker = new SharedWorker('/common/outer/sharedworker.js?' + urlArgs); worker = new SharedWorker('/common/outer/sharedworker.js?' + urlArgs);
worker.onerror = function (e) { worker.onerror = function (e) {
console.error(e.message); console.error(e.message);
@ -947,7 +957,7 @@ define([
window.addEventListener('beforeunload', function () { window.addEventListener('beforeunload', function () {
postMsg('CLOSE'); postMsg('CLOSE');
}); });
} else if (false && !noWorker && 'serviceWorker' in navigator) { } else if (false && !noWorker && !noSharedWorker && 'serviceWorker' in navigator) {
var initializing = true; var initializing = true;
var stopWaiting = waitFor2(); // Call this function when we're ready var stopWaiting = waitFor2(); // Call this function when we're ready