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

Fix cache and merge issues

Browse Source
This commit is contained in:
yflory
2018-06-06 18:10:58 +02:00
parent 305b47132c
commit 48dc8c78b4
4 changed files with 204 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -769,8 +769,10 @@ define([
var postMsg, worker;
Nthen(function (waitFor2) {
if (SharedWorker) {
worker = new SharedWorker('/common/outer/sharedworker.js' + urlArgs);
console.log(worker);
worker = new SharedWorker('/common/outer/sharedworker.js?' + urlArgs);
worker.onerror = function (e) {
console.error(e);
};
worker.port.onmessage = function (ev) {
if (ev.data === "SW_READY") {
return;
@@ -789,7 +791,7 @@ define([
if (worker) { return void worker.postMessage(data); }
};
navigator.serviceWorker.register('/common/outer/serviceworker.js' + urlArgs, {scope: '/'})
navigator.serviceWorker.register('/common/outer/serviceworker.js?' + urlArgs, {scope: '/'})
.then(function(reg) {
// Add handler for receiving messages from the service worker
navigator.serviceWorker.addEventListener('message', function (ev) {
@@ -829,7 +831,7 @@ define([
/**/console.log('Registration failed with ' + error);
});
} else if (Worker) {
worker = new Worker('/common/outer/webworker.js' + urlArgs);
worker = new Worker('/common/outer/webworker.js?' + urlArgs);
worker.onmessage = function (ev) {
msgEv.fire(ev);
};