keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

removed plugin cache invalidation with timestamps

This commit is contained in:
antelle 2020-05-24 19:07:01 +02:00
parent b5fddeb627
commit f215c26a63
No known key found for this signature in database
GPG Key ID: 63C9777AAB7C563C
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/plugins/plugin-gallery.js
View File

@ -22,7 +22,7 @@ const PluginGallery = {
return new Promise(resolve => {
this.logger.debug('Loading plugins...');
const xhr = new XMLHttpRequest();
xhr.open('GET', Links.Plugins + '/plugins.json?_=' + Date.now());
xhr.open('GET', Links.Plugins + '/plugins.json');
xhr.responseType = 'json';
xhr.send();
xhr.addEventListener('load', () => {

11
app/scripts/plugins/plugin.js
View File

@ -166,7 +166,9 @@ class Plugin extends Model {
);
this.resources = {};
const ts = this.logger.ts();
const results = Object.keys(manifest.resources).map(res => this.loadResource(res, local));
const results = Object.keys(manifest.resources).map(res =>
this.loadResource(res, local, manifest)
);
return Promise.all(results)
.catch(() => {
throw 'Error loading plugin resources';
@ -195,7 +197,7 @@ class Plugin extends Model {
return this.id + '_' + this.getResourcePath(res);
}
loadResource(type, local) {
loadResource(type, local, manifest) {
const ts = this.logger.ts();
let res;
if (local) {
@ -204,8 +206,8 @@ class Plugin extends Model {
io.load(storageKey, (err, data) => (err ? reject(err) : resolve(data)));
});
} else {
const url = this.url;
res = httpGet(url + this.getResourcePath(type), true);
const url = this.url + this.getResourcePath(type) + '?v=' + manifest.version;
res = httpGet(url, true);
}
return res.then(data => {
this.logger.debug('Resource data loaded', type, this.logger.ts(ts));
@ -688,7 +690,6 @@ Plugin.defineModelProperties({
Object.assign(Plugin, PluginStatus);
function httpGet(url, binary) {
url += '?ts=' + Date.now();
commonLogger.debug('GET', url);
const ts = commonLogger.ts();
return new Promise((resolve, reject) => {