Skip to content

Commit 157c254

Browse files
committed
fix Conditional in main.js
1 parent 14e97c4 commit 157c254

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

webui/dspf.d.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ export declare class FieldInfo {
8080
}
8181
export declare class Conditional {
8282
conditions: Condition[];
83-
//indicator: number;
84-
//negate: boolean;
85-
//constructor(indicator: number, negate?: boolean);
8683
}
8784
export declare class Condition {
8885
indicators: Indicator[];

webui/main.js

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -262,13 +262,17 @@ function renderSelectedFormat(layer, format) {
262262
windowTitle.keywords.push({
263263
name: `COLOR`,
264264
value: parts[index + 1],
265-
conditional: new Conditional()
265+
conditional: {
266+
conditions: [{indicators: []}]
267+
}
266268
});
267269
case `*DSPATR`:
268270
windowTitle.keywords.push({
269271
name: `DSPATR`,
270272
value: parts[index + 1],
271-
conditional: new Conditional()
273+
conditional: {
274+
conditions: [{indicators: []}]
275+
}
272276
});
273277
break;
274278

@@ -290,7 +294,9 @@ function renderSelectedFormat(layer, format) {
290294
windowTitle.keywords.push({
291295
name: `COLOR`,
292296
value: `BLU`,
293-
conditional: new Conditional()
297+
conditional: {
298+
conditions: [{indicators: []}]
299+
}
294300
});
295301
}
296302

@@ -811,7 +817,7 @@ function clearFieldInfo() {
811817
};
812818

813819
return button;
814-
}
820+
};
815821

816822
// Creates: <vscode-button secondary>Secondary button</vscode-button>
817823

@@ -1296,25 +1302,27 @@ function editKeyword(onUpdate, keyword) {
12961302
const newKeyword = {
12971303
name: keywordName,
12981304
value: keywordValue ? keywordValue : undefined,
1299-
conditional: new Conditional()
1305+
conditional: {
1306+
conditions: [{indicators: []}]
1307+
}
13001308
};
13011309

13021310
if (ind1 !== `None`) {
1303-
newKeyword.conditions.push({
1311+
newKeyword.conditional.conditions[0].indicators.push({
13041312
indicator: ind1,
13051313
negate: neg1
13061314
});
13071315
}
13081316

13091317
if (ind2 !== `None`) {
1310-
newKeyword.conditions.push({
1318+
newKeyword.conditional.conditions[0].indicators.push({
13111319
indicator: ind2,
13121320
negate: neg2
13131321
});
13141322
}
13151323

13161324
if (ind3 !== `None`) {
1317-
newKeyword.conditions.push({
1325+
newKeyword.conditional.conditions[0].indicators.push({
13181326
indicator: ind3,
13191327
negate: neg3
13201328
});

0 commit comments

Comments
 (0)