OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix load failure in firefox when indexedDB is disabled

pull/21833/head
Richard van der Hoff 2017-06-22 15:07:54 +01:00
parent 5d159c995d
commit b124ac21fd
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/utils/createMatrixClient.js
View File

@ -18,6 +18,13 @@ import Matrix from 'matrix-js-sdk';
const localStorage = window.localStorage; const localStorage = window.localStorage;
// just *accessing* indexedDB throws an exception in firefox with
// indexeddb disabled.
let indexedDB;
try {
indexedDB = window.indexedDB;
} catch(e) {}
/** /**
* Create a new matrix client, with the persistent stores set up appropriately * Create a new matrix client, with the persistent stores set up appropriately
* (using localstorage/indexeddb, etc) * (using localstorage/indexeddb, etc)
@ -37,12 +44,13 @@ export default function createMatrixClient(opts) {
if (localStorage) { if (localStorage) {
storeOpts.sessionStore = new Matrix.WebStorageSessionStore(localStorage); storeOpts.sessionStore = new Matrix.WebStorageSessionStore(localStorage);
} }
if (window.indexedDB && localStorage) {
if (indexedDB && localStorage) {
// FIXME: bodge to remove old database. Remove this after a few weeks. // FIXME: bodge to remove old database. Remove this after a few weeks.
window.indexedDB.deleteDatabase("matrix-js-sdk:default"); indexedDB.deleteDatabase("matrix-js-sdk:default");
storeOpts.store = new Matrix.IndexedDBStore({ storeOpts.store = new Matrix.IndexedDBStore({
indexedDB: window.indexedDB, indexedDB: indexedDB,
dbName: "riot-web-sync", dbName: "riot-web-sync",
localStorage: localStorage, localStorage: localStorage,
workerScript: createMatrixClient.indexedDbWorkerScript, workerScript: createMatrixClient.indexedDbWorkerScript,