From 52900fbfa3596460c237cebeae8946201652e5e1 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Fri, 4 Jun 2021 11:52:36 -0400 Subject: [PATCH] fm-editor: lint min/max now egMin/egMax Signed-off-by: Galen Charlton --- .../src/eg2/src/app/share/fm-editor/fm-editor.component.html | 4 ++-- .../src/eg2/src/app/share/fm-editor/fm-editor.component.ts | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html index 03b5026c97..859dc0b6c4 100644 --- a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html +++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html @@ -113,8 +113,8 @@ placeholder="{{field.label}}..." i18n-placeholder [required]="field.isRequired()" - min="{{field.min}}" - max="{{field.max}}" + egMin="{{field.min}}" + egMax="{{field.max}}" [ngModel]="record[field.name]()" (ngModelChange)="record[field.name]($event)"/> diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts index 010c6332a1..94b354927f 100644 --- a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts @@ -810,30 +810,30 @@ export class FmRecordEditorComponent // https://stackoverflow.com/a/57812865 @Directive({ - selector: 'input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]', + selector: 'input[type=number][egMin][formControlName],input[type=number][egMin][formControl],input[type=number][egMin][ngModel]', providers: [{ provide: NG_VALIDATORS, useExisting: MinValidatorDirective, multi: true }] }) export class MinValidatorDirective implements Validator { - @HostBinding('attr.min') @Input() min: number; + @HostBinding('attr.egMin') @Input() egMin: number; constructor() { } validate(control: AbstractControl): ValidationErrors | null { - const validator = Validators.min(this.min); + const validator = Validators.min(this.egMin); return validator(control); } } @Directive({ - selector: 'input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]', + selector: 'input[type=number][egMax][formControlName],input[type=number][egMax][formControl],input[type=number][egMax][ngModel]', providers: [{ provide: NG_VALIDATORS, useExisting: MaxValidatorDirective, multi: true }] }) export class MaxValidatorDirective implements Validator { - @HostBinding('attr.max') @Input() max: number; + @HostBinding('attr.egMax') @Input() egMax: number; constructor() { } validate(control: AbstractControl): ValidationErrors | null { - const validator = Validators.max(this.max); + const validator = Validators.max(this.egMax); return validator(control); } } -- 2.11.0