Added optional chaining to initDefaultVal() in settings.load() for easier cross-maintenance

Author: adamlui

chatgpt-auto-continue/chromium/extension/lib/settings.js

@@ -56,9 +56,9 @@ window.settings = {
             return Promise.all(keys.map(async key => // resolve promise when all keys load
                 config[key] = (await chrome.storage.local.get(key))[key] ?? initDefaultVal(key)))
         function initDefaultVal(key) {
-            return this.controls[key]?.defaultVal
-                ?? this.controls[key]?.type == 'slider' ? 100
-                 : this.controls[key]?.type == 'toggle'
+            return this.controls?.[key]?.defaultVal
+                ?? this.controls?.[key]?.type == 'slider' ? 100
+                 : this.controls?.[key]?.type == 'toggle'
         }
     },
 

chatgpt-auto-continue/firefox/extension/lib/settings.js

@@ -56,9 +56,9 @@ window.settings = {
             return Promise.all(keys.map(async key => // resolve promise when all keys load
                 config[key] = (await chrome.storage.local.get(key))[key] ?? initDefaultVal(key)))
         function initDefaultVal(key) {
-            return this.controls[key]?.defaultVal
-                ?? this.controls[key]?.type == 'slider' ? 100
-                 : this.controls[key]?.type == 'toggle'
+            return this.controls?.[key]?.defaultVal
+                ?? this.controls?.[key]?.type == 'slider' ? 100
+                 : this.controls?.[key]?.type == 'toggle'
         }
     },
 

chatgpt-infinity/chromium/extension/lib/settings.js

@@ -85,9 +85,9 @@ window.settings = {
             return Promise.all(keys.map(async key => // resolve promise when all keys load
                 config[key] = (await chrome.storage.local.get(key))[key] ?? initDefaultVal(key)))
         function initDefaultVal(key) {
-            return this.controls[key]?.defaultVal
-                ?? this.controls[key]?.type == 'slider' ? 100
-                 : this.controls[key]?.type == 'toggle'
+            return this.controls?.[key]?.defaultVal
+                ?? this.controls?.[key]?.type == 'slider' ? 100
+                 : this.controls?.[key]?.type == 'toggle'
         }
     },
 

chatgpt-infinity/firefox/extension/lib/settings.js

@@ -85,9 +85,9 @@ window.settings = {
             return Promise.all(keys.map(async key => // resolve promise when all keys load
                 config[key] = (await chrome.storage.local.get(key))[key] ?? initDefaultVal(key)))
         function initDefaultVal(key) {
-            return this.controls[key]?.defaultVal
-                ?? this.controls[key]?.type == 'slider' ? 100
-                 : this.controls[key]?.type == 'toggle'
+            return this.controls?.[key]?.defaultVal
+                ?? this.controls?.[key]?.type == 'slider' ? 100
+                 : this.controls?.[key]?.type == 'toggle'
         }
     },
 

chatgpt-widescreen/chromium/extension/lib/settings.js

@@ -142,9 +142,9 @@ window.settings = {
                 config[key] = result[`${env.site}_${key}`] ?? result[key] ?? initDefaultVal(key)
             }))
         function initDefaultVal(key) {
-            return this.controls[key]?.defaultVal
-                ?? this.controls[key]?.type == 'slider' ? 100
-                 : this.controls[key]?.type == 'toggle'
+            return this.controls?.[key]?.defaultVal
+                ?? this.controls?.[key]?.type == 'slider' ? 100
+                 : this.controls?.[key]?.type == 'toggle'
         }
     },
 

chatgpt-widescreen/firefox/extension/lib/settings.js

@@ -142,9 +142,9 @@ window.settings = {
                 config[key] = result[`${env.site}_${key}`] ?? result[key] ?? initDefaultVal(key)
             }))
         function initDefaultVal(key) {
-            return this.controls[key]?.defaultVal
-                ?? this.controls[key]?.type == 'slider' ? 100
-                 : this.controls[key]?.type == 'toggle'
+            return this.controls?.[key]?.defaultVal
+                ?? this.controls?.[key]?.type == 'slider' ? 100
+                 : this.controls?.[key]?.type == 'toggle'
         }
     },