Condensed settings.load() ↞ [auto-sync from https://github.com/adam…

…lui/ai-web-extensions/tree/main/chatgpt-auto-continue]
adamlui · Jan 12, 2025 · 7623f9e · 7623f9e
1 parent 3be7539
commit 7623f9e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/chromium/extension/lib/settings.js b/chromium/extension/lib/settings.js
@@ -24,13 +24,10 @@ window.settings = {
                     this.controls[key]?.defaultVal ?? this.controls[key]?.type == 'toggle')
             })
         else // asynchronously load from browser extension storage
-            return Promise.all(keys.map(key => // resolve promise when all keys load
-                new Promise(resolve => // resolve promise when single key value loads
-                    chrome.storage.sync.get(key, result => {
-                        window.config[key] = result[key]
-                            ?? this.controls[key]?.defaultVal ?? this.controls[key]?.type == 'toggle'
-                        resolve()
-        }))))
+            return Promise.all(keys.map(async key => // resolve promise when all keys load
+                window.config[key] = (await chrome.storage.sync.get(key))[key]
+                    ?? this.controls[key]?.defaultVal ?? this.controls[key]?.type == 'toggle'
+            ))
     },
 
     save(key, val) {

diff --git a/firefox/extension/lib/settings.js b/firefox/extension/lib/settings.js
@@ -24,13 +24,10 @@ window.settings = {
                     this.controls[key]?.defaultVal ?? this.controls[key]?.type == 'toggle')
             })
         else // asynchronously load from browser extension storage
-            return Promise.all(keys.map(key => // resolve promise when all keys load
-                new Promise(resolve => // resolve promise when single key value loads
-                    chrome.storage.sync.get(key, result => {
-                        window.config[key] = result[key]
-                            ?? this.controls[key]?.defaultVal ?? this.controls[key]?.type == 'toggle'
-                        resolve()
-        }))))
+            return Promise.all(keys.map(async key => // resolve promise when all keys load
+                window.config[key] = (await chrome.storage.sync.get(key))[key]
+                    ?? this.controls[key]?.defaultVal ?? this.controls[key]?.type == 'toggle'
+            ))
     },
 
     save(key, val) {