From a537f7de8be83b2657295abd48df769b7f73e556 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 28 Jun 2018 16:13:52 +0200
Subject: [PATCH] Fix infinite loading screen caused by some browser settings
---
www/common/cryptpad-common.js | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 589ec0292..833380513 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -907,6 +907,7 @@ define([
var msgEv = Util.mkEvent();
var postMsg, worker;
var noWorker = AppConfig.disableWorkers || false;
+ var noSharedWorker = false;
if (localStorage.CryptPad_noWorkers) {
noWorker = localStorage.CryptPad_noWorkers === '1';
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) {
- if (!noWorker && typeof(SharedWorker) !== "undefined") {
+ if (!noWorker && !noSharedWorker && typeof(SharedWorker) !== "undefined") {
worker = new SharedWorker('/common/outer/sharedworker.js?' + urlArgs);
worker.onerror = function (e) {
console.error(e.message);
@@ -947,7 +957,7 @@ define([
window.addEventListener('beforeunload', function () {
postMsg('CLOSE');
});
- } else if (false && !noWorker && 'serviceWorker' in navigator) {
+ } else if (false && !noWorker && !noSharedWorker && 'serviceWorker' in navigator) {
var initializing = true;
var stopWaiting = waitFor2(); // Call this function when we're ready