From 5b99354a6f575d3361fe61eb3b0bb6df0e34686a Mon Sep 17 00:00:00 2001 From: rhenck <richard.henck@iqb.hu-berlin.de> Date: Fri, 15 Oct 2021 12:30:35 +0200 Subject: [PATCH] Improve inputAssistancePreset display value and variable name --- projects/common/classes/textAreaElement.ts | 2 +- projects/common/classes/textFieldElement.ts | 2 +- .../page-view/properties/element-properties.component.html | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/common/classes/textAreaElement.ts b/projects/common/classes/textAreaElement.ts index 4a0d31d10..377d68352 100644 --- a/projects/common/classes/textAreaElement.ts +++ b/projects/common/classes/textAreaElement.ts @@ -14,7 +14,7 @@ export class TextAreaElement extends InputElement implements FontElement, Surfac underline: boolean = false; inputAssistance: boolean = false; - inputAssistancePreset: 'french' | 'numbers' | 'operators' | null = null; + inputAssistancePreset: 'french' | 'numbers' | 'numbersAndOperators' | null = null; backgroundColor: string = 'transparent'; diff --git a/projects/common/classes/textFieldElement.ts b/projects/common/classes/textFieldElement.ts index d61453b83..7181f15c5 100644 --- a/projects/common/classes/textFieldElement.ts +++ b/projects/common/classes/textFieldElement.ts @@ -12,7 +12,7 @@ export class TextFieldElement extends InputElement implements FontElement, Surfa patternWarnMessage: string = 'Eingabe entspricht nicht der Vorgabe'; inputAssistance: boolean = false; - inputAssistancePreset: 'french' | 'numbers' | 'operators' | null = null; + inputAssistancePreset: 'french' | 'numbers' | 'numbersAndOperators' | null = null; fontColor: string = 'black'; font: string = 'Roboto'; diff --git a/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.html b/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.html index 135fef80e..70a36c4f5 100644 --- a/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.html +++ b/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.html @@ -214,9 +214,9 @@ <mat-form-field *ngIf="combinedProperties.inputAssistance" appearance="fill"> <mat-label>Art der Eingabehilfe</mat-label> <mat-select (selectionChange)="updateModel('inputAssistancePreset', $event.value)"> - <mat-option *ngFor="let option of [{displayValue: 'Französisch', value: 'french'}, + <mat-option *ngFor="let option of [{displayValue: 'Französische Sonderzeichen', value: 'french'}, {displayValue: 'Zahlen', value: 'numbers'}, - {displayValue: 'Operatoren', value: 'operators'}]" + {displayValue: 'Zahlen & Operatoren', value: 'numbersAndOperators'}]" [value]="option.value"> {{option.displayValue}} </mat-option> -- GitLab