Merge branch 'master' of https://github.com/Servoy/bootstrapcomponent…

…s.git
Servoy · Apr 10, 2024 · 91f0e1c · 91f0e1c
2 parents a7a5718 + 93f3c1d
commit 91f0e1c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 31 deletions.
diff --git a/projects/bootstrapcomponents/src/textbox/textbox.html b/projects/bootstrapcomponents/src/textbox/textbox.html
@@ -16,7 +16,6 @@
     [autocomplete]="autocomplete"
 	[type]="inputType == 'password-with-eye' && showPass ? 'text' : inputType == 'password-with-eye' ? 'password' : inputType"
 	[findmode]="findmode"
-	(blur)="dateLostfocus($event)"
 />
 <div id="svy-textbox-eyeDiv" *ngIf="inputType == 'password-with-eye'"
 		(click)="showHidePass()"

diff --git a/projects/bootstrapcomponents/src/textbox/textbox.ts b/projects/bootstrapcomponents/src/textbox/textbox.ts
@@ -21,21 +21,10 @@ export class ServoyBootstrapTextbox extends ServoyBootstrapBasefield<HTMLInputEl
 
     showPass = false;
     classForEye = '';
-    isEditDate = false;
 
     constructor(renderer: Renderer2, cdRef: ChangeDetectorRef, @Inject(DOCUMENT) doc: Document, protected windowService: WindowRefService) {
         super(renderer, cdRef, doc);
     }
-
-     @HostListener('keydown', ['$event'])
-     onKeyDown(event: KeyboardEvent) {
-		if (this.isDateType()) {
-			this.isEditDate = true;
-			if (event.key === 'Enter') {
-				this.changeDate();
-			}
-		}
-	 }
 
     svyOnInit() {
         super.svyOnInit();
@@ -62,12 +51,15 @@ export class ServoyBootstrapTextbox extends ServoyBootstrapBasefield<HTMLInputEl
     }
 
     onModelChange(newValue) {
-		if (this.isEditDate) return; 
         // if format or invalid date, force dataprovider display with formated value / invalid date text
         if(this.format || (newValue && typeof newValue.getTime === 'function' && isNaN(newValue.getTime()))) {
             this.svyFormat.writeValue(newValue);
         } 
         this.dataProviderID = newValue;
+
+        if (this.isDateType()) {
+			this.pushUpdate();
+		}
     }
 
     setInputType(inputType: string) {
@@ -112,26 +104,8 @@ export class ServoyBootstrapTextbox extends ServoyBootstrapBasefield<HTMLInputEl
 		}
 	}
 
-	dateLostfocus(event) {
-		if (this.isDateType()) {
-			this.changeDate();
-		}
-	}
-
 	isDateType() {
 		const types = ['date', 'time', 'datetime-local', 'month', 'week'];
 		return types.includes(this.inputType);
 	}
-
-	changeDate() {
-		this.isEditDate = false;
-		this.svyFormat.input(this.elementRef.nativeElement.value);
-		this.pushUpdate();
-	}
-
-	pushUpdate() {
-		if (!this.isEditDate) {
-			super.pushUpdate();
-		}
-	}
 }