Skip to content

Commit 1375c03

Browse files
authored
Simplify startup code in library_browser.js. NFC (emscripten-core#20619)
Also apply this simplification in a few other places in the JS library.
1 parent 8f9bd0c commit 1375c03

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

src/Fetch.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ var Fetch = {
2525
dbg(`fetch: indexedDB.open(dbname="${dbname}", dbversion="${dbversion}");`);
2626
#endif
2727
var openRequest = indexedDB.open(dbname, dbversion);
28-
} catch (e) { return onerror(e); }
28+
} catch (e) {
29+
return onerror(e);
30+
}
2931

3032
openRequest.onupgradeneeded = (event) => {
3133
#if FETCH_DEBUG
@@ -38,7 +40,7 @@ var Fetch = {
3840
db.createObjectStore('FILES');
3941
};
4042
openRequest.onsuccess = (event) => onsuccess(event.target.result);
41-
openRequest.onerror = (error) => onerror(error);
43+
openRequest.onerror = onerror;
4244
},
4345
#endif
4446

src/IDBStore.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,41 +73,39 @@ var IDBStore = {
7373
}
7474
return callback(null, result);
7575
};
76-
req.onerror = (error) => {
77-
callback(error);
78-
};
76+
req.onerror = callback;
7977
});
8078
},
8179
setFile(dbName, id, data, callback) {
8280
IDBStore.getStore(dbName, 'readwrite', (err, store) => {
8381
if (err) return callback(err);
8482
var req = store.put(data, id);
8583
req.onsuccess = (event) => callback();
86-
req.onerror = (error) => callback(error);
84+
req.onerror = callback;
8785
});
8886
},
8987
deleteFile(dbName, id, callback) {
9088
IDBStore.getStore(dbName, 'readwrite', (err, store) => {
9189
if (err) return callback(err);
9290
var req = store.delete(id);
9391
req.onsuccess = (event) => callback();
94-
req.onerror = (error) => callback(error);
92+
req.onerror = callback;
9593
});
9694
},
9795
existsFile(dbName, id, callback) {
9896
IDBStore.getStore(dbName, 'readonly', (err, store) => {
9997
if (err) return callback(err);
10098
var req = store.count(id);
10199
req.onsuccess = (event) => callback(null, event.target.result > 0);
102-
req.onerror = (error) => callback(error);
100+
req.onerror = callback;
103101
});
104102
},
105103
clearStore(dbName, callback) {
106104
IDBStore.getStore(dbName, 'readwrite', (err, store) => {
107105
if (err) return callback(err);
108106
var req = store.clear();
109107
req.onsuccess = (event) => callback();
110-
req.onerror = (error) => callback(error);
108+
req.onerror = callback;
111109
});
112110
},
113111
};

src/library_browser.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ var LibraryBrowser = {
2121
],
2222
$Browser__postset: `
2323
// exports
24-
Module["requestFullscreen"] = (lockPointer, resizeCanvas) => Browser.requestFullscreen(lockPointer, resizeCanvas);
24+
Module["requestFullscreen"] = Browser.requestFullscreen;
2525
#if ASSERTIONS
26-
Module["requestFullScreen"] = () => Browser.requestFullScreen();
26+
Module["requestFullScreen"] = Browser.requestFullScreen;
2727
#endif
28-
Module["requestAnimationFrame"] = (func) => Browser.requestAnimationFrame(func);
29-
Module["setCanvasSize"] = (width, height, noUpdates) => Browser.setCanvasSize(width, height, noUpdates);
30-
Module["pauseMainLoop"] = () => Browser.mainLoop.pause();
31-
Module["resumeMainLoop"] = () => Browser.mainLoop.resume();
32-
Module["getUserMedia"] = () => Browser.getUserMedia();
33-
Module["createContext"] = (canvas, useWebGL, setInModule, webGLContextAttributes) => Browser.createContext(canvas, useWebGL, setInModule, webGLContextAttributes);
28+
Module["requestAnimationFrame"] = Browser.requestAnimationFrame;
29+
Module["setCanvasSize"] = Browser.setCanvasSize;
30+
Module["pauseMainLoop"] = Browser.mainLoop.pause;
31+
Module["resumeMainLoop"] = Browser.mainLoop.resume;
32+
Module["getUserMedia"] = Browser.getUserMedia;
33+
Module["createContext"] = Browser.createContext;
3434
var preloadedImages = {};
3535
var preloadedAudios = {};`,
3636

src/library_idbfs.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ addToLibrary({
207207
},
208208
loadRemoteEntry: (store, path, callback) => {
209209
var req = store.get(path);
210-
req.onsuccess = (event) => { callback(null, event.target.result); };
210+
req.onsuccess = (event) => callback(null, event.target.result);
211211
req.onerror = (e) => {
212212
callback(e.target.error);
213213
e.preventDefault();
@@ -220,15 +220,15 @@ addToLibrary({
220220
callback(e);
221221
return;
222222
}
223-
req.onsuccess = () => { callback(null); };
223+
req.onsuccess = (event) => callback();
224224
req.onerror = (e) => {
225225
callback(e.target.error);
226226
e.preventDefault();
227227
};
228228
},
229229
removeRemoteEntry: (store, path, callback) => {
230230
var req = store.delete(path);
231-
req.onsuccess = () => { callback(null); };
231+
req.onsuccess = (event) => callback();
232232
req.onerror = (e) => {
233233
callback(e.target.error);
234234
e.preventDefault();

0 commit comments

Comments
 (0)