Fix cache issues

This commit is contained in:
yflory 2018-06-06 17:45:43 +02:00
parent 953d98be96
commit 598d56c75e
2 changed files with 42 additions and 52 deletions

View File

@ -16,13 +16,14 @@ define([
Messaging, Constants, Feedback, LocalStore, /*AStore, */Channel, Messaging, Constants, Feedback, LocalStore, /*AStore, */Channel,
AppConfig, Nthen) { AppConfig, Nthen) {
/* This file exposes functionality which is specific to Cryptpad, but not to /* This file exposes functionality which is specific to Cryptpad, but not to
any particular pad type. This includes functions for committing metadata any particular pad type. This includes functions for committing metadata
about pads to your local storage for future use and improved usability. about pads to your local storage for future use and improved usability.
Additionally, there is some basic functionality for import/export. Additionally, there is some basic functionality for import/export.
*/ */
var urlArgs = Util.find(Config, ['requireConf', 'urlArgs']) || '';
var postMessage = function (/*cmd, data, cb*/) { var postMessage = function (/*cmd, data, cb*/) {
/*setTimeout(function () { /*setTimeout(function () {
AStore.query(cmd, data, cb); AStore.query(cmd, data, cb);
@ -885,7 +886,7 @@ define([
}));*/ }));*/
var msgEv = Util.mkEvent(); var msgEv = Util.mkEvent();
var worker = new Worker('/common/outer/webworker.js'); var worker = new Worker('/common/outer/webworker.js?' + urlArgs);
worker.onmessage = function (ev) { worker.onmessage = function (ev) {
msgEv.fire(ev); msgEv.fire(ev);
}; };

View File

@ -1,33 +1,21 @@
/* jshint ignore:start */ /* jshint ignore:start */
importScripts('/bower_components/requirejs/require.js'); importScripts('/bower_components/requirejs/require.js');
require.config({
// fix up locations so that relative urls work.
baseUrl: '/',
paths: {
// jquery declares itself as literally "jquery" so it cannot be pulled by path :(
"jquery": "/bower_components/jquery/dist/jquery.min",
// json.sortify same
"json.sortify": "/bower_components/json.sortify/dist/JSON.sortify",
cm: '/bower_components/codemirror'
},
map: {
'*': {
'css': '/bower_components/require-css/css.js',
'less': '/common/RequireLess.js',
}
}
});
window = self; window = self;
localStorage = { localStorage = {
setItem: function (k, v) { localStorage[k] = v; }, setItem: function (k, v) { localStorage[k] = v; },
getItem: function (k) { return localStorage[k]; } getItem: function (k) { return localStorage[k]; }
}; };
require([ require([
'/common/requireconfig.js'
], function (RequireConfig) {
require.config(RequireConfig());
require([
'/common/common-util.js', '/common/common-util.js',
'/common/outer/worker-channel.js', '/common/outer/worker-channel.js',
'/common/outer/store-rpc.js' '/common/outer/store-rpc.js'
], function (Util, Channel, Rpc) { ], function (Util, Channel, Rpc) {
var msgEv = Util.mkEvent(); var msgEv = Util.mkEvent();
Channel.create(msgEv, postMessage, function (chan) { Channel.create(msgEv, postMessage, function (chan) {
@ -60,4 +48,5 @@ require([
onmessage = function (e) { onmessage = function (e) {
msgEv.fire(e); msgEv.fire(e);
}; };
});
}); });