holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix buttons that have icon & label did not always get both

Browse Source 
Statistic submit cancel button, for example
This commit is contained in:
nathan 2022-07-28 13:06:18 -06:00
parent d4cbafc5a8
commit 6bf74dcb11
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
api/js/etemplate/Et2Button/Et2Button.ts
View File

@ -9,7 +9,7 @@
*/ */
import {css} from "@lion/core"; import {css, PropertyValues} from "@lion/core";
import {Et2InputWidget} from "../Et2InputWidget/Et2InputWidget"; import {Et2InputWidget} from "../Et2InputWidget/Et2InputWidget";
import '../Et2Image/Et2Image'; import '../Et2Image/Et2Image';
import {SlButton} from "@shoelace-style/shoelace"; import {SlButton} from "@shoelace-style/shoelace";
@ -154,14 +154,18 @@ export class Et2Button extends Et2InputWidget(SlButton)
set label(new_label : string) set label(new_label : string)
{ {
if(!this._labelNode) this.updateComplete.then(() =>
{ {
this.textContent = new_label; if(!this._labelNode)
} {
else const textNode = document.createTextNode(new_label);
{ this.appendChild(textNode);
this._labelNode.textContent = new_label; }
} else
{
this._labelNode.textContent = new_label;
}
});
} }
get label() get label()
@ -171,7 +175,7 @@ export class Et2Button extends Et2InputWidget(SlButton)
set image(new_image : string) set image(new_image : string)
{ {
let oldValue = this._image; let oldValue = this.__image;
if(new_image.indexOf("http") >= 0) if(new_image.indexOf("http") >= 0)
{ {
this.__image = new_image this.__image = new_image
@ -180,13 +184,6 @@ export class Et2Button extends Et2InputWidget(SlButton)
{ {
this.__image = this.egw().image(new_image); this.__image = this.egw().image(new_image);
} }
if(!this._iconNode)
{
const image = document.createElement("et2-image");
image.slot = "prefix";
this.prepend(image);
}
this._iconNode.src = this.__image;
this.requestUpdate("image", oldValue); this.requestUpdate("image", oldValue);
} }
@ -270,6 +267,22 @@ export class Et2Button extends Et2InputWidget(SlButton)
} }
} }
updated(changedProperties : PropertyValues)
{
super.updated(changedProperties);
if(changedProperties.has("image"))
{
if(this.image && !this._iconNode)
{
const image = document.createElement("et2-image");
image.slot = "prefix";
this.prepend(image);
}
this._iconNode.src = this.__image;
}
}
/** /**
* Get a default image for the button based on ID * Get a default image for the button based on ID
* *