Skip to content

Commit 30dda15

Browse files
committed
Shortened controlType to ctrlType, added ctrlStatus check before appending to label ↞ [auto-sync from https://github.com/adamlui/ai-web-extensions/tree/main/chatgpt-widescreen]
1 parent c92419c commit 30dda15

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

chromium/extension/popup/controller.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,27 +114,28 @@
114114
const childEntriesDiv = dom.create.elem('div') ; document.body.append(childEntriesDiv)
115115
Object.keys(settings.controls).forEach(key => {
116116
if (!sites[env.site].availFeatures.includes(key)) return
117-
const controlType = settings.controls[key].type
117+
const ctrlType = settings.controls[key].type,
118+
ctrlStatus = settings.controls[key].status
118119

119120
// Init entry's elems
120121
const entry = {
121122
div: dom.create.elem('div', {
122123
class: 'menu-entry highlight-on-hover', title: settings.controls[key].helptip || '' }),
123-
leftElem: dom.create.elem('div', { class: `menu-icon ${ controlType || '' }` }),
124+
leftElem: dom.create.elem('div', { class: `menu-icon ${ ctrlType || '' }` }),
124125
label: dom.create.elem('span')
125126
}
126127
entry.label.textContent = settings.controls[key].label
127128
entry.div.append(entry.leftElem, entry.label) ; childEntriesDiv.append(entry.div)
128-
if (controlType == 'toggle') { // add track to left, init knob pos
129+
if (ctrlType == 'toggle') { // add track to left, init knob pos
129130
entry.leftElem.append(dom.create.elem('span', { class: 'track' }))
130131
entry.leftElem.classList.toggle('on', settingIsEnabled(key))
131132
} else { // add symbol to left, append status to right
132133
entry.leftElem.innerText = settings.controls[key].symbol
133-
entry.label.innerText += `— ${settings.controls[key].status}`
134+
entry.label.innerText += ctrlStatus ? `— ${ctrlStatus }` : ''
134135
}
135136

136137
entry.div.onclick = () => {
137-
if (controlType == 'toggle') {
138+
if (ctrlType == 'toggle') {
138139
entry.leftElem.classList.toggle('on')
139140
settings.save(key, !config[key]) ; sync.configToUI({ updatedKey: key })
140141
notify(`${settings.controls[key].label} ${chrome.i18n.getMessage(`state_${

firefox/extension/popup/controller.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,27 +114,28 @@
114114
const childEntriesDiv = dom.create.elem('div') ; document.body.append(childEntriesDiv)
115115
Object.keys(settings.controls).forEach(key => {
116116
if (!sites[env.site].availFeatures.includes(key)) return
117-
const controlType = settings.controls[key].type
117+
const ctrlType = settings.controls[key].type,
118+
ctrlStatus = settings.controls[key].status
118119

119120
// Init entry's elems
120121
const entry = {
121122
div: dom.create.elem('div', {
122123
class: 'menu-entry highlight-on-hover', title: settings.controls[key].helptip || '' }),
123-
leftElem: dom.create.elem('div', { class: `menu-icon ${ controlType || '' }` }),
124+
leftElem: dom.create.elem('div', { class: `menu-icon ${ ctrlType || '' }` }),
124125
label: dom.create.elem('span')
125126
}
126127
entry.label.textContent = settings.controls[key].label
127128
entry.div.append(entry.leftElem, entry.label) ; childEntriesDiv.append(entry.div)
128-
if (controlType == 'toggle') { // add track to left, init knob pos
129+
if (ctrlType == 'toggle') { // add track to left, init knob pos
129130
entry.leftElem.append(dom.create.elem('span', { class: 'track' }))
130131
entry.leftElem.classList.toggle('on', settingIsEnabled(key))
131132
} else { // add symbol to left, append status to right
132133
entry.leftElem.innerText = settings.controls[key].symbol
133-
entry.label.innerText += `— ${settings.controls[key].status}`
134+
entry.label.innerText += ctrlStatus ? `— ${ctrlStatus }` : ''
134135
}
135136

136137
entry.div.onclick = () => {
137-
if (controlType == 'toggle') {
138+
if (ctrlType == 'toggle') {
138139
entry.leftElem.classList.toggle('on')
139140
settings.save(key, !config[key]) ; sync.configToUI({ updatedKey: key })
140141
notify(`${settings.controls[key].label} ${chrome.i18n.getMessage(`state_${

0 commit comments

Comments
 (0)