Skip to content

Commit d20434c

Browse files
authored
Remove support for old mozIndexedDB/webkitIndexDB/etc. (#24674)
The `indexedDB` global has been available for a long time now. See https://caniuse.com/indexeddb.
1 parent 75a9aec commit d20434c

File tree

3 files changed

+5
-17
lines changed

3 files changed

+5
-17
lines changed

src/IDBStore.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@
66

77
var IDBStore = {
88
indexedDB() {
9-
if (typeof indexedDB != 'undefined') return indexedDB;
10-
var ret = null;
11-
if (typeof window == 'object') ret = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
129
#if ASSERTIONS
13-
assert(ret, 'IDBStore used, but indexedDB not supported');
10+
assert(typeof indexedDB != 'undefined', 'IDBStore used, but indexedDB not supported');
1411
#endif
15-
return ret;
12+
return indexedDB;
1613
},
1714
DB_VERSION: 22,
1815
DB_STORE_NAME: 'FILE_DATA',

src/lib/libidbfs.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,10 @@ addToLibrary({
1313
$IDBFS: {
1414
dbs: {},
1515
indexedDB: () => {
16-
if (typeof indexedDB != 'undefined') return indexedDB;
17-
var ret = null;
18-
if (typeof window == 'object') ret = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
1916
#if ASSERTIONS
20-
assert(ret, 'IDBFS used, but indexedDB not supported');
17+
assert(typeof indexedDB != 'undefined', 'IDBFS used, but indexedDB not supported');
2118
#endif
22-
return ret;
19+
return indexedDB;
2320
},
2421
DB_VERSION: 21,
2522
DB_STORE_NAME: 'FILE_DATA',

tools/file_packager.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -807,13 +807,7 @@ def generate_js(data_target, data_files, metadata):
807807
return errback();
808808
}'''
809809
code += '''
810-
var indexedDB;
811-
if (typeof window === 'object') {
812-
indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
813-
} else if (typeof location !== 'undefined') {
814-
// worker
815-
indexedDB = self.indexedDB;
816-
} else {
810+
if (typeof indexedDB == 'undefined') {
817811
throw 'using IndexedDB to cache data can only be done on a web page or in a web worker';
818812
}
819813
try {

0 commit comments

Comments
 (0)