PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1133 from matrix-org/rav/use_worker_to_clear_storage

Browse source 
Use the web worker when clearing js-sdk stores
This commit is contained in:
David Baker 2017-06-21 18:30:00 +01:00 committed by GitHub
commit ebcf78c816
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/MatrixClientPeg.js
View file

@ -48,7 +48,6 @@ class MatrixClientPeg {
this.opts = {
initialSyncLimit: 20,
};
this.indexedDbWorkerScript = null;
}
/**
@ -59,7 +58,7 @@ class MatrixClientPeg {
* @param {string} script href to the script to be passed to the web worker
*/
setIndexedDbWorkerScript(script) {
this.indexedDbWorkerScript = script;
createMatrixClient.indexedDbWorkerScript = script;
}
get(): MatrixClient {

10
src/utils/createMatrixClient.js
View file

@ -25,13 +25,13 @@ const localStorage = window.localStorage;
* @param {Object} opts options to pass to Matrix.createClient. This will be
* extended with `sessionStore` and `store` members.
*
* @param {string} indexedDbWorkerScript Optional URL for a web worker script
* for IndexedDB store operations. If not given, indexeddb ops are done on
* @property {string} indexedDbWorkerScript Optional URL for a web worker script
* for IndexedDB store operations. By default, indexeddb ops are done on
* the main thread.
*
* @returns {MatrixClient} the newly-created MatrixClient
*/
export default function createMatrixClient(opts, indexedDbWorkerScript) {
export default function createMatrixClient(opts) {
const storeOpts = {};
if (localStorage) {
@ -45,7 +45,7 @@ export default function createMatrixClient(opts, indexedDbWorkerScript) {
indexedDB: window.indexedDB,
dbName: "riot-web-sync",
localStorage: localStorage,
workerScript: indexedDbWorkerScript,
workerScript: createMatrixClient.indexedDbWorkerScript,
});
}
@ -53,3 +53,5 @@ export default function createMatrixClient(opts, indexedDbWorkerScript) {
return Matrix.createClient(opts);
}
createMatrixClient.indexedDbWorkerScript = null;