mirror of
https://github.com/home-assistant/frontend.git
synced 2025-07-14 21:06:34 +00:00
Fix mixin names (#1849)
This commit is contained in:
parent
06bf134bd4
commit
47fb8a5513
@ -6,18 +6,18 @@ import {
|
||||
} from "@polymer/lit-element";
|
||||
import { HomeAssistant } from "../types";
|
||||
import {
|
||||
LocalizeBaseMixin,
|
||||
localizeBaseMixin,
|
||||
LocalizeFunc,
|
||||
LocalizeMixin,
|
||||
} from "./localize-base-mixin";
|
||||
|
||||
const empty = () => "";
|
||||
|
||||
export const HassLocalizeLitMixin = <T extends LitElement>(
|
||||
export const hassLocalizeLitMixin = <T extends LitElement>(
|
||||
superClass: Constructor<T>
|
||||
): Constructor<T & LocalizeMixin> =>
|
||||
// @ts-ignore
|
||||
class extends LocalizeBaseMixin(superClass) {
|
||||
class extends localizeBaseMixin(superClass) {
|
||||
protected hass?: HomeAssistant;
|
||||
protected localize!: LocalizeFunc;
|
||||
|
||||
|
@ -35,7 +35,7 @@ export interface LocalizeMixin {
|
||||
localize: LocalizeFunc;
|
||||
}
|
||||
|
||||
export const LocalizeBaseMixin = (superClass) =>
|
||||
export const localizeBaseMixin = (superClass) =>
|
||||
class extends superClass {
|
||||
/**
|
||||
* Returns a computed `localize` method, based on the current `language`.
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Lite mixin to add localization without depending on the Hass object.
|
||||
*/
|
||||
import { dedupingMixin } from "@polymer/polymer/lib/utils/mixin.js";
|
||||
import { LocalizeBaseMixin } from "./localize-base-mixin";
|
||||
import { localizeBaseMixin } from "./localize-base-mixin";
|
||||
import {
|
||||
getActiveTranslation,
|
||||
getTranslation,
|
||||
@ -13,7 +13,7 @@ import {
|
||||
*/
|
||||
export default dedupingMixin(
|
||||
(superClass) =>
|
||||
class extends LocalizeBaseMixin(superClass) {
|
||||
class extends localizeBaseMixin(superClass) {
|
||||
static get properties() {
|
||||
return {
|
||||
language: {
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { dedupingMixin } from "@polymer/polymer/lib/utils/mixin.js";
|
||||
import { LocalizeBaseMixin } from "./localize-base-mixin";
|
||||
import { localizeBaseMixin } from "./localize-base-mixin";
|
||||
/**
|
||||
* Polymer Mixin to enable a localize function powered by language/resources from hass object.
|
||||
*
|
||||
@ -7,7 +7,7 @@ import { LocalizeBaseMixin } from "./localize-base-mixin";
|
||||
*/
|
||||
export default dedupingMixin(
|
||||
(superClass) =>
|
||||
class extends LocalizeBaseMixin(superClass) {
|
||||
class extends localizeBaseMixin(superClass) {
|
||||
static get properties() {
|
||||
return {
|
||||
hass: Object,
|
||||
|
@ -11,7 +11,7 @@ import computeStateName from "../../../common/entity/compute_state_name.js";
|
||||
import applyThemesOnElement from "../../../common/dom/apply_themes_on_element.js";
|
||||
import { styleMap } from "lit-html/directives/styleMap.js";
|
||||
import { HomeAssistant } from "../../../types.js";
|
||||
import { HassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
|
||||
import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
|
||||
import { LovelaceCard, LovelaceConfig } from "../types.js";
|
||||
|
||||
interface Config extends LovelaceConfig {
|
||||
@ -24,7 +24,7 @@ interface Config extends LovelaceConfig {
|
||||
service_data?: object;
|
||||
}
|
||||
|
||||
class HuiEntityButtonCard extends HassLocalizeLitMixin(LitElement)
|
||||
class HuiEntityButtonCard extends hassLocalizeLitMixin(LitElement)
|
||||
implements LovelaceCard {
|
||||
public hass?: HomeAssistant;
|
||||
protected config?: Config;
|
||||
|
@ -13,7 +13,7 @@ import "../../../components/ha-card.js";
|
||||
import "../../../components/ha-icon.js";
|
||||
|
||||
import { fireEvent } from "../../../common/dom/fire_event.js";
|
||||
import { HassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
|
||||
import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
|
||||
import { HomeAssistant } from "../../../types.js";
|
||||
import { LovelaceCard, LovelaceConfig } from "../types.js";
|
||||
|
||||
@ -35,7 +35,7 @@ interface Config extends LovelaceConfig {
|
||||
columns?: number;
|
||||
}
|
||||
|
||||
export class HuiGlanceCard extends HassLocalizeLitMixin(LitElement)
|
||||
export class HuiGlanceCard extends hassLocalizeLitMixin(LitElement)
|
||||
implements LovelaceCard {
|
||||
public hass?: HomeAssistant;
|
||||
protected config?: Config;
|
||||
@ -49,7 +49,9 @@ export class HuiGlanceCard extends HassLocalizeLitMixin(LitElement)
|
||||
}
|
||||
|
||||
public getCardSize() {
|
||||
return (this.config!.title ? 1 : 0) + Math.ceil(this.configEntities!.length / 5);
|
||||
return (
|
||||
(this.config!.title ? 1 : 0) + Math.ceil(this.configEntities!.length / 5)
|
||||
);
|
||||
}
|
||||
|
||||
public setConfig(config: Config) {
|
||||
@ -86,7 +88,9 @@ export class HuiGlanceCard extends HassLocalizeLitMixin(LitElement)
|
||||
${this.renderStyle()}
|
||||
<ha-card .header="${title}">
|
||||
<div class="entities ${classMap({ "no-header": !title })}">
|
||||
${this.configEntities!.map(entityConf => this.renderEntity(entityConf))}
|
||||
${this.configEntities!.map((entityConf) =>
|
||||
this.renderEntity(entityConf)
|
||||
)}
|
||||
</div>
|
||||
</ha-card>
|
||||
`;
|
||||
|
@ -10,8 +10,7 @@ interface Config extends LovelaceConfig {
|
||||
url: string;
|
||||
}
|
||||
|
||||
export class HuiIframeCard extends LitElement
|
||||
implements LovelaceCard {
|
||||
export class HuiIframeCard extends LitElement implements LovelaceCard {
|
||||
protected config?: Config;
|
||||
|
||||
static get properties() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user