extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:49:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Api: Fix up favorite button

Browse Source 
- clicking favorite did nothing
- stop delete flicker
- remove delete button from current as favorite
This commit is contained in:
nathan 2024-01-08 15:24:09 -07:00
parent e2e85a65e4
commit 0f143b31e2
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
api/js/etemplate/Et2Favorites/Et2Favorites.ts
View File

@ -69,24 +69,24 @@ export class Et2Favorites extends Et2DropdownButton implements et2_INextmatchHea
min-width: 15em; min-width: 15em;
} }
sl-option:hover et2-image[src="trash"] { sl-menu-item:hover et2-image[src="trash"] {
display: initial; display: initial;
} }
/* Add star icons - radio button is already in prefix */ /* Add star icons - radio button is already in prefix */
sl-option::part(base) { sl-menu-item::part(base) {
background-image: ${cssImage("fav_filter")}; background-image: ${cssImage("fav_filter")};
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 16px 16px; background-size: 16px 16px;
background-position: 5px center; background-position: 5px center;
} }
sl-option[checked]::part(base) { sl-menu-item[checked]::part(base) {
background-image: ${cssImage("favorites")}; background-image: ${cssImage("favorites")};
} }
sl-option:last-child::part(base) { sl-menu-item:last-child::part(base) {
background-image: none; background-image: none;
} }
`, `,
@ -173,16 +173,16 @@ export class Et2Favorites extends Et2DropdownButton implements et2_INextmatchHea
//@ts-ignore TS doesn't know about window.app //@ts-ignore TS doesn't know about window.app
let is_admin = (typeof this.egw().app('admin') != "undefined"); let is_admin = (typeof this.egw().app('admin') != "undefined");
//@ts-ignore option.group does not exist //@ts-ignore option.group does not exist
let icon = (option.group !== false && !is_admin || option.value == 'blank') ? "" : html` let icon = (option.group !== false && !is_admin || ['blank', '~add~'].includes(option.value)) ? "" : html`
<et2-image slot="suffix" src=${"trash"} icon @click=${this._handleDelete} <et2-image slot="suffix" src=${"trash"} icon @click=${this._handleDelete}
statustext="${this.egw().lang("Delete")}"></et2-image>`; statustext="${this.egw().lang("Delete")}"></et2-image>`;
return html` return html`
<sl-option value="${option.value}" ?checked="${option.value == this._preferred}"> <sl-menu-item value="${option.value}" ?checked="${option.value == this._preferred}">
${option.value !== Et2Favorites.ADD_VALUE ? radio : ""} ${option.value !== Et2Favorites.ADD_VALUE ? radio : ""}
${icon} ${icon}
${option.label} ${option.label}
</sl-option>`; </sl-menu-item>`;
} }
@ -352,6 +352,17 @@ export class Et2Favorites extends Et2DropdownButton implements et2_INextmatchHea
this._apply_favorite(ev.detail.item.value); this._apply_favorite(ev.detail.item.value);
} }
/**
* Handle the click from the main button
*
* @param {MouseEvent} event
* @protected
*/
protected _handleClick(event : MouseEvent)
{
this._apply_favorite(this.preferred);
}
/** /**
* Clicked a radio button * Clicked a radio button
* *
@ -438,7 +449,7 @@ export class Et2Favorites extends Et2DropdownButton implements et2_INextmatchHea
* @returns {boolean} * @returns {boolean}
* @protected * @protected
*/ */
_handleClick(_ev : MouseEvent) : boolean _handleSelect(_ev : MouseEvent) : boolean
{ {
// Apply preferred filter - make sure it's an object, and not a reference // Apply preferred filter - make sure it's an object, and not a reference
if(this._preferred && this.favoriteByID(this._preferred)) if(this._preferred && this.favoriteByID(this._preferred))