From e9ab667d292dade3233e5bb35b04fc4ee4c5b158 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 21 Jun 2017 17:43:34 +0100
Subject: [PATCH] Use the web worker when clearing js-sdk stores

It turns out that Firefox doesn't let you use indexeddb from private tabs,
*unless* you are *also* in a webworker. We need to either consistently use it
or not use it - so let's use it.
---
 src/MatrixClientPeg.js          |  3 +--
 src/utils/createMatrixClient.js | 10 ++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index ba372add13..774a1e598c 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -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 {
diff --git a/src/utils/createMatrixClient.js b/src/utils/createMatrixClient.js
index 5effd63f2a..b95a9f111f 100644
--- a/src/utils/createMatrixClient.js
+++ b/src/utils/createMatrixClient.js
@@ -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;