forked from extern/egroupware
Et2Description: Fix missing styles from extending classes (Et2Url) while also keeping decrypt on hover working
This commit is contained in:
parent
234684061d
commit
416136dc24
@ -8,7 +8,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import {Et2Widget} from "../Et2Widget/Et2Widget";
|
import {Et2Widget} from "../Et2Widget/Et2Widget";
|
||||||
import {css, html, LitElement} from "@lion/core";
|
import {css, html, LitElement, render} from "@lion/core";
|
||||||
import {et2_IDetachedDOM} from "../et2_core_interfaces";
|
import {et2_IDetachedDOM} from "../et2_core_interfaces";
|
||||||
import {activateLinks} from "../ActivateLinksDirective";
|
import {activateLinks} from "../ActivateLinksDirective";
|
||||||
|
|
||||||
@ -19,15 +19,11 @@ export class Et2Description extends Et2Widget(LitElement) implements et2_IDetach
|
|||||||
|
|
||||||
static get styles()
|
static get styles()
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
* No styles for Et2Description due to how we're rendering content directly into light DOM
|
|
||||||
* anything added here won't work
|
|
||||||
*/
|
|
||||||
return [
|
return [
|
||||||
...super.styles,
|
...super.styles,
|
||||||
css`
|
css`
|
||||||
:host {
|
:host {
|
||||||
white-space: pre-wrap;
|
white-space: pre-line;
|
||||||
}
|
}
|
||||||
:host a {
|
:host a {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
@ -91,6 +87,17 @@ export class Et2Description extends Et2Widget(LitElement) implements et2_IDetach
|
|||||||
this._handleClick = this._handleClick.bind(this);
|
this._handleClick = this._handleClick.bind(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
connectedCallback()
|
||||||
|
{
|
||||||
|
super.connectedCallback();
|
||||||
|
|
||||||
|
// Put content directly in DOM
|
||||||
|
if(this.value)
|
||||||
|
{
|
||||||
|
render(this._renderContent(), this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
set_value(value)
|
set_value(value)
|
||||||
{
|
{
|
||||||
this.value = value;
|
this.value = value;
|
||||||
@ -125,7 +132,7 @@ export class Et2Description extends Et2Widget(LitElement) implements et2_IDetach
|
|||||||
this.requestUpdate('value', oldValue);
|
this.requestUpdate('value', oldValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
render()
|
_renderContent()
|
||||||
{
|
{
|
||||||
let render = null;
|
let render = null;
|
||||||
|
|
||||||
@ -151,18 +158,16 @@ export class Et2Description extends Et2Widget(LitElement) implements et2_IDetach
|
|||||||
{
|
{
|
||||||
render = html`${this._value}`;
|
render = html`${this._value}`;
|
||||||
}
|
}
|
||||||
return html`${render}`;
|
return render;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
render()
|
||||||
* Put everything into the light DOM
|
|
||||||
* @returns {this}
|
|
||||||
*/
|
|
||||||
createRenderRoot()
|
|
||||||
{
|
{
|
||||||
return this;
|
return html`
|
||||||
|
<slot></slot>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async firstUpdated()
|
async firstUpdated()
|
||||||
{
|
{
|
||||||
this.removeEventListener('click.extra_link', this._handleClick);
|
this.removeEventListener('click.extra_link', this._handleClick);
|
||||||
|
@ -47,7 +47,7 @@ const Et2InputWidgetMixin = (superclass) =>
|
|||||||
static get styles()
|
static get styles()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
super.styles,
|
...super.styles,
|
||||||
css`
|
css`
|
||||||
/* Needed so required can show through */
|
/* Needed so required can show through */
|
||||||
::slotted(input), input {
|
::slotted(input), input {
|
||||||
|
@ -231,7 +231,7 @@ div.et2_hbox > div {
|
|||||||
/**
|
/**
|
||||||
* Label widget, and labels for other widgets
|
* Label widget, and labels for other widgets
|
||||||
*/
|
*/
|
||||||
.et2_label, et2-description {
|
.et2_label {
|
||||||
color: #101050;
|
color: #101050;
|
||||||
white-space: pre-wrap;
|
white-space: pre-wrap;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user