From 47fb8a55134332aeb4387a5ff3e978d3175b0fa6 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 24 Oct 2018 12:10:58 +0200 Subject: [PATCH] Fix mixin names (#1849) --- src/mixins/lit-localize-mixin.ts | 6 +++--- src/mixins/localize-base-mixin.ts | 2 +- src/mixins/localize-lite-mixin.js | 4 ++-- src/mixins/localize-mixin.js | 4 ++-- src/panels/lovelace/cards/hui-entity-button-card.ts | 4 ++-- src/panels/lovelace/cards/hui-glance-card.ts | 12 ++++++++---- src/panels/lovelace/cards/hui-iframe-card.ts | 3 +-- 7 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/mixins/lit-localize-mixin.ts b/src/mixins/lit-localize-mixin.ts index 3692e98e81..ef81a75b3c 100644 --- a/src/mixins/lit-localize-mixin.ts +++ b/src/mixins/lit-localize-mixin.ts @@ -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 = ( +export const hassLocalizeLitMixin = ( superClass: Constructor ): Constructor => // @ts-ignore - class extends LocalizeBaseMixin(superClass) { + class extends localizeBaseMixin(superClass) { protected hass?: HomeAssistant; protected localize!: LocalizeFunc; diff --git a/src/mixins/localize-base-mixin.ts b/src/mixins/localize-base-mixin.ts index a3c8f6b6ab..0bb3a31aef 100644 --- a/src/mixins/localize-base-mixin.ts +++ b/src/mixins/localize-base-mixin.ts @@ -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`. diff --git a/src/mixins/localize-lite-mixin.js b/src/mixins/localize-lite-mixin.js index 53faf78ec4..6f2aec4b96 100644 --- a/src/mixins/localize-lite-mixin.js +++ b/src/mixins/localize-lite-mixin.js @@ -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: { diff --git a/src/mixins/localize-mixin.js b/src/mixins/localize-mixin.js index 263e97bcb5..5928fb36db 100644 --- a/src/mixins/localize-mixin.js +++ b/src/mixins/localize-mixin.js @@ -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, diff --git a/src/panels/lovelace/cards/hui-entity-button-card.ts b/src/panels/lovelace/cards/hui-entity-button-card.ts index 12ebf4312a..633a048679 100644 --- a/src/panels/lovelace/cards/hui-entity-button-card.ts +++ b/src/panels/lovelace/cards/hui-entity-button-card.ts @@ -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; diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts index a91f375e7a..ca43c901f2 100644 --- a/src/panels/lovelace/cards/hui-glance-card.ts +++ b/src/panels/lovelace/cards/hui-glance-card.ts @@ -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()}
- ${this.configEntities!.map(entityConf => this.renderEntity(entityConf))} + ${this.configEntities!.map((entityConf) => + this.renderEntity(entityConf) + )}
`; diff --git a/src/panels/lovelace/cards/hui-iframe-card.ts b/src/panels/lovelace/cards/hui-iframe-card.ts index 0a2c049a74..04411cad41 100644 --- a/src/panels/lovelace/cards/hui-iframe-card.ts +++ b/src/panels/lovelace/cards/hui-iframe-card.ts @@ -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() {