extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 13:51:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
ralf 2024-01-15 14:22:20 +02:00
parent b8ea368d52
commit 6c2610ca50
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -667,8 +667,6 @@ export class Et2Email extends Et2InputWidget(LitElement) implements SearchMixinI
} }
} }
<<<<<<< HEAD
=======
/** /**
* Sometimes users paste multiple comma separated values at once. Split them then handle normally. * Sometimes users paste multiple comma separated values at once. Split them then handle normally.
@ -707,7 +705,6 @@ export class Et2Email extends Et2InputWidget(LitElement) implements SearchMixinI
} }
} }
>>>>>>> f68faa7941 (Et2Email: Some automatic tests)
private handleSearchFocus() private handleSearchFocus()
{ {
this.hasFocus = true; this.hasFocus = true;
@ -725,8 +722,6 @@ export class Et2Email extends Et2InputWidget(LitElement) implements SearchMixinI
this.hasFocus = false; this.hasFocus = false;
// Should not be needed, but not firing the update // Should not be needed, but not firing the update
this.requestUpdate("hasFocus"); this.requestUpdate("hasFocus");
<<<<<<< HEAD
=======
// If they had something OK typed, use it, but only if focus went outside Et2Email // If they had something OK typed, use it, but only if focus went outside Et2Email
// because maybe they clicked an option which took focus // because maybe they clicked an option which took focus
@ -744,7 +739,6 @@ export class Et2Email extends Et2InputWidget(LitElement) implements SearchMixinI
this.set_validation_error(this.egw().lang("Invalid email") + ' "' + this._search.value + '"') this.set_validation_error(this.egw().lang("Invalid email") + ' "' + this._search.value + '"')
} }
} }
>>>>>>> f68faa7941 (Et2Email: Some automatic tests)
} }
handleSearchKeyDown(event) handleSearchKeyDown(event)