Skip to content

Commit d392dfb

Browse files
committed
Moved settingIsEnabled() into settings ↞ [auto-sync from https://github.com/adamlui/ai-web-extensions/tree/main/chatgpt-widescreen]
1 parent b90f04b commit d392dfb

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

chromium/extension/lib/settings.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ window.settings = {
5959
getMsg(key) {
6060
return typeof GM_info != 'undefined' ? this.imports.app.msgs[key] : chrome.i18n.getMessage(key) },
6161

62+
isEnabled(key) { return config[key] ^ /disabled/i.test(key) },
63+
6264
load(...keys) {
6365
keys = keys.flat() // flatten array args nested by spread operator
6466
if (typeof GM_info != 'undefined') // synchronously load from userscript manager storage

chromium/extension/popup/controller.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
return await chrome.tabs.sendMessage(activeTab.id, { action: action, options: { ...options }})
3939
}
4040

41-
function settingIsEnabled(key) { return config[key] ^ /disabled/i.test(key) }
42-
4341
const sync = {
4442
fade() {
4543

@@ -128,7 +126,7 @@
128126
entry.div.append(entry.leftElem, entry.label) ; childEntriesDiv.append(entry.div)
129127
if (ctrlType == 'toggle') { // add track to left, init knob pos
130128
entry.leftElem.append(dom.create.elem('span', { class: 'track' }))
131-
entry.leftElem.classList.toggle('on', settingIsEnabled(key))
129+
entry.leftElem.classList.toggle('on', settings.isEnabled(key))
132130
} else { // add symbol to left, append status to right
133131
entry.leftElem.innerText = settings.controls[key].symbol
134132
entry.label.innerText += ctrlStatus ? `— ${ctrlStatus }` : ''
@@ -139,7 +137,7 @@
139137
entry.leftElem.classList.toggle('on')
140138
settings.save(key, !config[key]) ; sync.configToUI({ updatedKey: key })
141139
notify(`${settings.controls[key].label} ${chrome.i18n.getMessage(`state_${
142-
settingIsEnabled(key) ? 'on' : 'off' }`).toUpperCase()}`)
140+
settings.isEnabled(key) ? 'on' : 'off' }`).toUpperCase()}`)
143141
}
144142
}
145143
})

firefox/extension/lib/settings.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ window.settings = {
5959
getMsg(key) {
6060
return typeof GM_info != 'undefined' ? this.imports.app.msgs[key] : chrome.i18n.getMessage(key) },
6161

62+
isEnabled(key) { return config[key] ^ /disabled/i.test(key) },
63+
6264
load(...keys) {
6365
keys = keys.flat() // flatten array args nested by spread operator
6466
if (typeof GM_info != 'undefined') // synchronously load from userscript manager storage

firefox/extension/popup/controller.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
return await chrome.tabs.sendMessage(activeTab.id, { action: action, options: { ...options }})
3939
}
4040

41-
function settingIsEnabled(key) { return config[key] ^ /disabled/i.test(key) }
42-
4341
const sync = {
4442
fade() {
4543

@@ -128,7 +126,7 @@
128126
entry.div.append(entry.leftElem, entry.label) ; childEntriesDiv.append(entry.div)
129127
if (ctrlType == 'toggle') { // add track to left, init knob pos
130128
entry.leftElem.append(dom.create.elem('span', { class: 'track' }))
131-
entry.leftElem.classList.toggle('on', settingIsEnabled(key))
129+
entry.leftElem.classList.toggle('on', settings.isEnabled(key))
132130
} else { // add symbol to left, append status to right
133131
entry.leftElem.innerText = settings.controls[key].symbol
134132
entry.label.innerText += ctrlStatus ? `— ${ctrlStatus }` : ''
@@ -139,7 +137,7 @@
139137
entry.leftElem.classList.toggle('on')
140138
settings.save(key, !config[key]) ; sync.configToUI({ updatedKey: key })
141139
notify(`${settings.controls[key].label} ${chrome.i18n.getMessage(`state_${
142-
settingIsEnabled(key) ? 'on' : 'off' }`).toUpperCase()}`)
140+
settings.isEnabled(key) ? 'on' : 'off' }`).toUpperCase()}`)
143141
}
144142
}
145143
})

0 commit comments

Comments
 (0)