Simplify startup code in library_browser.js. NFC

Also apply this simplification in a few other places in the JS library.
sbc100 · Nov 5, 2023 · 02b537d · 02b537d
1 parent aa25047
commit 02b537d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/src/Fetch.js b/src/Fetch.js
@@ -25,7 +25,9 @@ var Fetch = {
       dbg(`fetch: indexedDB.open(dbname="${dbname}", dbversion="${dbversion}");`);
 #endif
       var openRequest = indexedDB.open(dbname, dbversion);
-    } catch (e) { return onerror(e); }
+    } catch (e) {
+      return onerror(e);
+    }
 
     openRequest.onupgradeneeded = (event) => {
 #if FETCH_DEBUG
@@ -38,7 +40,7 @@ var Fetch = {
       db.createObjectStore('FILES');
     };
     openRequest.onsuccess = (event) => onsuccess(event.target.result);
-    openRequest.onerror = (error) => onerror(error);
+    openRequest.onerror = onerror;
   },
 #endif
 

diff --git a/src/IDBStore.js b/src/IDBStore.js
@@ -73,41 +73,39 @@ var IDBStore = {
         }
         return callback(null, result);
       };
-      req.onerror = (error) => {
-        callback(error);
-      };
+      req.onerror = callback;
     });
   },
   setFile(dbName, id, data, callback) {
     IDBStore.getStore(dbName, 'readwrite', (err, store) => {
       if (err) return callback(err);
       var req = store.put(data, id);
       req.onsuccess = (event) => callback();
-      req.onerror = (error) => callback(error);
+      req.onerror = callback;
     });
   },
   deleteFile(dbName, id, callback) {
     IDBStore.getStore(dbName, 'readwrite', (err, store) => {
       if (err) return callback(err);
       var req = store.delete(id);
       req.onsuccess = (event) => callback();
-      req.onerror = (error) => callback(error);
+      req.onerror = callback;
     });
   },
   existsFile(dbName, id, callback) {
     IDBStore.getStore(dbName, 'readonly', (err, store) => {
       if (err) return callback(err);
       var req = store.count(id);
       req.onsuccess = (event) => callback(null, event.target.result > 0);
-      req.onerror = (error) => callback(error);
+      req.onerror = callback;
     });
   },
   clearStore(dbName, callback) {
     IDBStore.getStore(dbName, 'readwrite', (err, store) => {
       if (err) return callback(err);
       var req = store.clear();
       req.onsuccess = (event) => callback();
-      req.onerror = (error) => callback(error);
+      req.onerror = callback;
     });
   },
 };
diff --git a/src/library_browser.js b/src/library_browser.js
@@ -21,16 +21,16 @@ var LibraryBrowser = {
   ],
   $Browser__postset: `
     // exports
-    Module["requestFullscreen"] = (lockPointer, resizeCanvas) => Browser.requestFullscreen(lockPointer, resizeCanvas);
+    Module["requestFullscreen"] = Browser.requestFullscreen;
 #if ASSERTIONS
-    Module["requestFullScreen"] = () => Browser.requestFullScreen();
+    Module["requestFullScreen"] = Browser.requestFullScreen;
 #endif
-    Module["requestAnimationFrame"] = (func) => Browser.requestAnimationFrame(func);
-    Module["setCanvasSize"] = (width, height, noUpdates) => Browser.setCanvasSize(width, height, noUpdates);
-    Module["pauseMainLoop"] = () => Browser.mainLoop.pause();
-    Module["resumeMainLoop"] = () => Browser.mainLoop.resume();
-    Module["getUserMedia"] = () => Browser.getUserMedia();
-    Module["createContext"] = (canvas, useWebGL, setInModule, webGLContextAttributes) => Browser.createContext(canvas, useWebGL, setInModule, webGLContextAttributes);
+    Module["requestAnimationFrame"] = Browser.requestAnimationFrame;
+    Module["setCanvasSize"] = Browser.setCanvasSize;
+    Module["pauseMainLoop"] = Browser.mainLoop.pause;
+    Module["resumeMainLoop"] = Browser.mainLoop.resume;
+    Module["getUserMedia"] = Browser.getUserMedia;
+    Module["createContext"] = Browser.createContext;
     var preloadedImages = {};
     var preloadedAudios = {};`,
 

diff --git a/src/library_idbfs.js b/src/library_idbfs.js
@@ -220,15 +220,15 @@ addToLibrary({
         callback(e);
         return;
       }
-      req.onsuccess = () => { callback(null); };
+      req.onsuccess = callback;
       req.onerror = (e) => {
         callback(e.target.error);
         e.preventDefault();
       };
     },
     removeRemoteEntry: (store, path, callback) => {
       var req = store.delete(path);
-      req.onsuccess = () => { callback(null); };
+      req.onsuccess = callback;
       req.onerror = (e) => {
         callback(e.target.error);
         e.preventDefault();