Skip to content

Commit 8d6abe7

Browse files
UziTechUziTech
committed
clean up settings
1 parent da96dc0 commit 8d6abe7

File tree

6 files changed

+25
-64
lines changed

6 files changed

+25
-64
lines changed

‎dist/lib/x-terminal.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/lib/x-terminal.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/lib/config.js

+5-43
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ export const config = configOrder({
106106
type: 'string',
107107
default: configDefaults.command,
108108
profileData: {
109-
inProfile: true,
110109
defaultProfile: configDefaults.command,
111110
toUrlParam: (val) => val,
112111
fromUrlParam: (val) => val,
@@ -122,7 +121,6 @@ export const config = configOrder({
122121
type: 'string',
123122
default: configDefaults.args,
124123
profileData: {
125-
inProfile: true,
126124
defaultProfile: JSON.parse(configDefaults.args),
127125
toUrlParam: (val) => JSON.stringify(val),
128126
fromUrlParam: (val) => JSON.parse(val),
@@ -138,7 +136,6 @@ export const config = configOrder({
138136
type: 'string',
139137
default: configDefaults.termType,
140138
profileData: {
141-
inProfile: true,
142139
defaultProfile: configDefaults.termType,
143140
toUrlParam: (val) => val,
144141
fromUrlParam: (val) => val,
@@ -154,7 +151,6 @@ export const config = configOrder({
154151
type: 'string',
155152
default: configDefaults.cwd,
156153
profileData: {
157-
inProfile: true,
158154
defaultProfile: configDefaults.cwd,
159155
toUrlParam: (val) => val,
160156
fromUrlParam: (val) => val,
@@ -170,7 +166,6 @@ export const config = configOrder({
170166
type: 'boolean',
171167
default: configDefaults.projectCwd,
172168
profileData: {
173-
inProfile: true,
174169
defaultProfile: configDefaults.projectCwd,
175170
toUrlParam: (val) => JSON.stringify(val),
176171
fromUrlParam: (val) => JSON.parse(val),
@@ -186,7 +181,6 @@ export const config = configOrder({
186181
type: 'string',
187182
default: configDefaults.env,
188183
profileData: {
189-
inProfile: true,
190184
defaultProfile: null,
191185
toUrlParam: (val) => JSON.stringify(val),
192186
fromUrlParam: (val) => JSON.parse(val),
@@ -208,7 +202,6 @@ export const config = configOrder({
208202
type: 'string',
209203
default: configDefaults.setEnv,
210204
profileData: {
211-
inProfile: true,
212205
defaultProfile: JSON.parse(configDefaults.setEnv),
213206
toUrlParam: (val) => JSON.stringify(val),
214207
fromUrlParam: (val) => JSON.parse(val),
@@ -224,7 +217,6 @@ export const config = configOrder({
224217
type: 'string',
225218
default: configDefaults.deleteEnv,
226219
profileData: {
227-
inProfile: true,
228220
defaultProfile: JSON.parse(configDefaults.deleteEnv),
229221
toUrlParam: (val) => JSON.stringify(val),
230222
fromUrlParam: (val) => JSON.parse(val),
@@ -240,7 +232,6 @@ export const config = configOrder({
240232
type: 'string',
241233
default: configDefaults.encoding,
242234
profileData: {
243-
inProfile: true,
244235
defaultProfile: null,
245236
toUrlParam: (val) => val,
246237
fromUrlParam: (val) => (val === 'null' ? null : val),
@@ -265,7 +256,6 @@ export const config = configOrder({
265256
minimum: configDefaults.minimumFontSize,
266257
maximum: configDefaults.maximumFontSize,
267258
profileData: {
268-
inProfile: true,
269259
terminalFrontEnd: true,
270260
defaultProfile: configDefaults.fontSize,
271261
toUrlParam: (val) => JSON.stringify(val),
@@ -282,7 +272,6 @@ export const config = configOrder({
282272
type: 'string',
283273
default: configDefaults.fontFamily,
284274
profileData: {
285-
inProfile: true,
286275
terminalFrontEnd: true,
287276
defaultProfile: configDefaults.fontFamily,
288277
toUrlParam: (val) => val,
@@ -332,7 +321,6 @@ export const config = configOrder({
332321
],
333322
default: configDefaults.theme,
334323
profileData: {
335-
inProfile: true,
336324
terminalFrontEnd: true,
337325
defaultProfile: configDefaults.theme,
338326
toUrlParam: (val) => val,
@@ -349,7 +337,6 @@ export const config = configOrder({
349337
type: 'color',
350338
default: configDefaults.colorForeground,
351339
profileData: {
352-
inProfile: true,
353340
terminalFrontEnd: true,
354341
defaultProfile: configDefaults.colorForeground,
355342
toUrlParam: (val) => val,
@@ -366,7 +353,6 @@ export const config = configOrder({
366353
type: 'color',
367354
default: configDefaults.colorBackground,
368355
profileData: {
369-
inProfile: true,
370356
terminalFrontEnd: true,
371357
defaultProfile: configDefaults.colorBackground,
372358
toUrlParam: (val) => val,
@@ -383,7 +369,6 @@ export const config = configOrder({
383369
type: 'color',
384370
default: configDefaults.colorCursor,
385371
profileData: {
386-
inProfile: true,
387372
terminalFrontEnd: true,
388373
defaultProfile: configDefaults.colorCursor,
389374
toUrlParam: (val) => val,
@@ -400,7 +385,6 @@ export const config = configOrder({
400385
type: 'color',
401386
default: configDefaults.colorCursorAccent,
402387
profileData: {
403-
inProfile: true,
404388
terminalFrontEnd: true,
405389
defaultProfile: configDefaults.colorCursorAccent,
406390
toUrlParam: (val) => val,
@@ -417,7 +401,6 @@ export const config = configOrder({
417401
type: 'color',
418402
default: configDefaults.colorSelection,
419403
profileData: {
420-
inProfile: true,
421404
terminalFrontEnd: true,
422405
defaultProfile: configDefaults.colorSelection,
423406
toUrlParam: (val) => val,
@@ -434,7 +417,6 @@ export const config = configOrder({
434417
type: 'color',
435418
default: configDefaults.colorBlack,
436419
profileData: {
437-
inProfile: true,
438420
terminalFrontEnd: true,
439421
defaultProfile: configDefaults.colorBlack,
440422
toUrlParam: (val) => val,
@@ -451,7 +433,6 @@ export const config = configOrder({
451433
type: 'color',
452434
default: configDefaults.colorRed,
453435
profileData: {
454-
inProfile: true,
455436
terminalFrontEnd: true,
456437
defaultProfile: configDefaults.colorRed,
457438
toUrlParam: (val) => val,
@@ -468,7 +449,6 @@ export const config = configOrder({
468449
type: 'color',
469450
default: configDefaults.colorGreen,
470451
profileData: {
471-
inProfile: true,
472452
terminalFrontEnd: true,
473453
defaultProfile: configDefaults.colorGreen,
474454
toUrlParam: (val) => val,
@@ -485,7 +465,6 @@ export const config = configOrder({
485465
type: 'color',
486466
default: configDefaults.colorYellow,
487467
profileData: {
488-
inProfile: true,
489468
terminalFrontEnd: true,
490469
defaultProfile: configDefaults.colorYellow,
491470
toUrlParam: (val) => val,
@@ -502,7 +481,6 @@ export const config = configOrder({
502481
type: 'color',
503482
default: configDefaults.colorBlue,
504483
profileData: {
505-
inProfile: true,
506484
terminalFrontEnd: true,
507485
defaultProfile: configDefaults.colorBlue,
508486
toUrlParam: (val) => val,
@@ -519,7 +497,6 @@ export const config = configOrder({
519497
type: 'color',
520498
default: configDefaults.colorMagenta,
521499
profileData: {
522-
inProfile: true,
523500
terminalFrontEnd: true,
524501
defaultProfile: configDefaults.colorMagenta,
525502
toUrlParam: (val) => val,
@@ -536,7 +513,6 @@ export const config = configOrder({
536513
type: 'color',
537514
default: configDefaults.colorCyan,
538515
profileData: {
539-
inProfile: true,
540516
terminalFrontEnd: true,
541517
defaultProfile: configDefaults.colorCyan,
542518
toUrlParam: (val) => val,
@@ -553,7 +529,6 @@ export const config = configOrder({
553529
type: 'color',
554530
default: configDefaults.colorWhite,
555531
profileData: {
556-
inProfile: true,
557532
terminalFrontEnd: true,
558533
defaultProfile: configDefaults.colorWhite,
559534
toUrlParam: (val) => val,
@@ -570,7 +545,6 @@ export const config = configOrder({
570545
type: 'color',
571546
default: configDefaults.colorBrightBlack,
572547
profileData: {
573-
inProfile: true,
574548
terminalFrontEnd: true,
575549
defaultProfile: configDefaults.colorBrightBlack,
576550
toUrlParam: (val) => val,
@@ -587,7 +561,6 @@ export const config = configOrder({
587561
type: 'color',
588562
default: configDefaults.colorBrightRed,
589563
profileData: {
590-
inProfile: true,
591564
terminalFrontEnd: true,
592565
defaultProfile: configDefaults.colorBrightRed,
593566
toUrlParam: (val) => val,
@@ -604,7 +577,6 @@ export const config = configOrder({
604577
type: 'color',
605578
default: configDefaults.colorBrightGreen,
606579
profileData: {
607-
inProfile: true,
608580
terminalFrontEnd: true,
609581
defaultProfile: configDefaults.colorBrightGreen,
610582
toUrlParam: (val) => val,
@@ -621,7 +593,6 @@ export const config = configOrder({
621593
type: 'color',
622594
default: configDefaults.colorBrightYellow,
623595
profileData: {
624-
inProfile: true,
625596
terminalFrontEnd: true,
626597
defaultProfile: configDefaults.colorBrightYellow,
627598
toUrlParam: (val) => val,
@@ -638,7 +609,6 @@ export const config = configOrder({
638609
type: 'color',
639610
default: configDefaults.colorBrightBlue,
640611
profileData: {
641-
inProfile: true,
642612
terminalFrontEnd: true,
643613
defaultProfile: configDefaults.colorBrightBlue,
644614
toUrlParam: (val) => val,
@@ -655,7 +625,6 @@ export const config = configOrder({
655625
type: 'color',
656626
default: configDefaults.colorBrightMagenta,
657627
profileData: {
658-
inProfile: true,
659628
terminalFrontEnd: true,
660629
defaultProfile: configDefaults.colorBrightMagenta,
661630
toUrlParam: (val) => val,
@@ -672,7 +641,6 @@ export const config = configOrder({
672641
type: 'color',
673642
default: configDefaults.colorBrightCyan,
674643
profileData: {
675-
inProfile: true,
676644
terminalFrontEnd: true,
677645
defaultProfile: configDefaults.colorBrightCyan,
678646
toUrlParam: (val) => val,
@@ -689,7 +657,6 @@ export const config = configOrder({
689657
type: 'color',
690658
default: configDefaults.colorBrightWhite,
691659
profileData: {
692-
inProfile: true,
693660
terminalFrontEnd: true,
694661
defaultProfile: configDefaults.colorBrightWhite,
695662
toUrlParam: (val) => val,
@@ -708,7 +675,6 @@ export const config = configOrder({
708675
type: 'boolean',
709676
default: configDefaults.leaveOpenAfterExit,
710677
profileData: {
711-
inProfile: true,
712678
defaultProfile: configDefaults.leaveOpenAfterExit,
713679
toUrlParam: (val) => JSON.stringify(val),
714680
fromUrlParam: (val) => JSON.parse(val),
@@ -730,7 +696,6 @@ export const config = configOrder({
730696
type: 'boolean',
731697
default: configDefaults.relaunchTerminalOnStartup,
732698
profileData: {
733-
inProfile: true,
734699
defaultProfile: configDefaults.relaunchTerminalOnStartup,
735700
toUrlParam: (val) => JSON.stringify(val),
736701
fromUrlParam: (val) => JSON.parse(val),
@@ -746,7 +711,6 @@ export const config = configOrder({
746711
type: 'string',
747712
default: configDefaults.title,
748713
profileData: {
749-
inProfile: true,
750714
defaultProfile: null,
751715
toUrlParam: (val) => val,
752716
fromUrlParam: (val) => (val === 'null' ? null : val),
@@ -778,7 +742,6 @@ export const config = configOrder({
778742
type: 'string',
779743
default: configDefaults.xtermOptions,
780744
profileData: {
781-
inProfile: true,
782745
terminalFrontEnd: true,
783746
defaultProfile: JSON.parse(configDefaults.xtermOptions),
784747
toUrlParam: (val) => JSON.stringify(val),
@@ -795,7 +758,6 @@ export const config = configOrder({
795758
type: 'boolean',
796759
default: configDefaults.promptToStartup,
797760
profileData: {
798-
inProfile: true,
799761
defaultProfile: configDefaults.promptToStartup,
800762
toUrlParam: (val) => JSON.stringify(val),
801763
fromUrlParam: (val) => JSON.parse(val),
@@ -818,7 +780,6 @@ export const config = configOrder({
818780
type: 'boolean',
819781
default: configDefaults.webgl,
820782
profileData: {
821-
inProfile: true,
822783
defaultProfile: configDefaults.webgl,
823784
toUrlParam: (val) => JSON.stringify(val),
824785
fromUrlParam: (val) => JSON.parse(val),
@@ -834,7 +795,6 @@ export const config = configOrder({
834795
type: 'boolean',
835796
default: configDefaults.webLinks,
836797
profileData: {
837-
inProfile: true,
838798
defaultProfile: configDefaults.webLinks,
839799
toUrlParam: (val) => JSON.stringify(val),
840800
fromUrlParam: (val) => JSON.parse(val),
@@ -923,10 +883,12 @@ function configToData (obj, prefix) {
923883
data.push(...configToData(obj[key].properties, `${prefix}.${key}`))
924884
} else {
925885
const profileData = obj[key].profileData
926-
delete obj[key].profileData
886+
if (profileData) {
887+
profileData.profileKey = key in COLORS ? COLORS[key] : key
888+
delete obj[key].profileData
889+
}
927890
const keyPath = `${prefix}.${key}`
928-
const profileKey = key in COLORS ? COLORS[key] : key
929-
data.push({ ...obj[key], ...profileData, keyPath, key, profileKey })
891+
data.push({ ...obj[key], ...profileData, keyPath })
930892
}
931893
}
932894
return data

‎src/lib/element.js

+1
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ class XTerminalElementImpl extends HTMLElement {
448448
this.disposables.add(this.profilesSingleton.onDidResetBaseProfile((baseProfile) => {
449449
const frontEndSettings = {}
450450
for (const data of CONFIG_DATA) {
451+
if (!data.profileKey) continue
451452
if (data.terminalFrontEnd) {
452453
frontEndSettings[data.profileKey] = baseProfile[data.profileKey]
453454
}

‎src/lib/profile-menu-element.js

+8-11
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class XTerminalProfileMenuElementImpl extends HTMLElement {
6363
// Horizontal line.
6464
this.mainDiv.appendChild(createHorizontalLine())
6565

66-
this.createFromConfig(CONFIG_DATA, baseProfile, modelProfile)
66+
this.createFromConfig(baseProfile, modelProfile)
6767

6868
this.deleteProfileModel = new XTerminalDeleteProfileModel(this)
6969
this.saveProfileModel = new XTerminalSaveProfileModel(this)
@@ -79,11 +79,9 @@ class XTerminalProfileMenuElementImpl extends HTMLElement {
7979
resolveInit()
8080
}
8181

82-
createFromConfig (configObj, baseProfile, modelProfile) {
83-
for (const data of configObj) {
84-
if (!data.inProfile) {
85-
continue
86-
}
82+
createFromConfig (baseProfile, modelProfile) {
83+
for (const data of CONFIG_DATA) {
84+
if (!data.profileKey) continue
8785
const title = data.title || data.profileKey.charAt(0).toUpperCase() + data.profileKey.substring(1).replace(/[A-Z]/g, ' $&')
8886
const description = data.description || ''
8987
if (data.enum) {
@@ -136,8 +134,9 @@ class XTerminalProfileMenuElementImpl extends HTMLElement {
136134
getMenuElements () {
137135
const menuElements = {}
138136
for (const data of CONFIG_DATA) {
139-
let type = 'textbox > atom-text-editor'
137+
if (!data.profileKey) continue
140138

139+
let type = 'textbox > atom-text-editor'
141140
if (data.enum) {
142141
type = 'select select'
143142
} else if (data.type === 'color') {
@@ -155,9 +154,7 @@ class XTerminalProfileMenuElementImpl extends HTMLElement {
155154
const baseProfile = this.profilesSingleton.getBaseProfile()
156155
const menuElements = this.getMenuElements()
157156
for (const data of CONFIG_DATA) {
158-
if (!data.inProfile) {
159-
continue
160-
}
157+
if (!data.profileKey) continue
161158
newProfile[data.profileKey] = data.fromMenuSetting(menuElements[data.profileKey], baseProfile[data.profileKey])
162159
}
163160
return newProfile
@@ -457,7 +454,7 @@ class XTerminalProfileMenuElementImpl extends HTMLElement {
457454

458455
setNewMenuSettings (profile, clear = false) {
459456
for (const data of CONFIG_DATA) {
460-
if (!data.inProfile) continue
457+
if (!data.profileKey) continue
461458

462459
if (data.enum) {
463460
const selector = `#${data.profileKey.toLowerCase()}-select select`

0 commit comments

Comments
 (0)