extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Et2Email: Fix validation message for invalid search text did not always show on field blur

Browse Source
This commit is contained in:
nathan 2023-12-18 11:50:34 -07:00
parent a348039716
commit 44f1317873
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
api/js/etemplate/Et2Email/Et2Email.ts
View File

@ -215,7 +215,7 @@ export class Et2Email extends Et2InputWidget(LitElement) implements SearchMixinI
this.open = false; this.open = false;
this._valueUID = this.egw().uid(); this._valueUID = this.egw().uid();
this.updateComplete.then(() => this.makeSortable()); this.updateComplete.then(() => this.makeSortable());
document.addEventListener('focusin', this.handleLostFocus); document.addEventListener('focusout', this.handleLostFocus);
} }
disconnectedCallback() disconnectedCallback()
@ -226,7 +226,7 @@ export class Et2Email extends Et2InputWidget(LitElement) implements SearchMixinI
{ {
this._sortable.destroy(); this._sortable.destroy();
} }
document.removeEventListener('focusin', this.handleLostFocus); document.removeEventListener('focusout', this.handleLostFocus);
} }
willUpdate(changedProperties : PropertyValues) willUpdate(changedProperties : PropertyValues)
@ -588,26 +588,21 @@ export class Et2Email extends Et2InputWidget(LitElement) implements SearchMixinI
*/ */
private handleLostFocus = (event : MouseEvent | KeyboardEvent) => private handleLostFocus = (event : MouseEvent | KeyboardEvent) =>
{ {
// Close when clicking outside of the component // If they had something OK typed, use it
const path = event.composedPath(); if(this.addAddress(this._search.value.trim()))
if(this && !path.includes(this))
{ {
// If they had something OK typed, use it this._search.value = "";
if(this.addAddress(this._search.value.trim()))
{
this._search.value = "";
}
else if(this._search.value)
{
// Invalid input, show message
// Can't just call this.validate() since the input is not part of the value
let currentValue = this.value;
this.value = [this._search.value];
this.validate();
this.value = currentValue;
}
this.hide();
} }
else if(this._search.value)
{
// Invalid input, show message
// Can't just call this.validate() since the input is not part of the value
let currentValue = this.value;
this.value = [this._search.value];
this.validate();
this.value = currentValue;
}
this.hide();
}; };
async handleOpenChange() async handleOpenChange()