jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-08-02 05:57:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6095 from home-assistant/dev

Browse Source
This commit is contained in:
Bram Kragten 2020-06-03 18:19:54 +02:00 committed by GitHub
commit 0d4c51f26e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup( setup(
name="home-assistant-frontend", name="home-assistant-frontend",
version="20200603.0", version="20200603.1",
description="The Home Assistant frontend", description="The Home Assistant frontend",
url="https://github.com/home-assistant/home-assistant-polymer", url="https://github.com/home-assistant/home-assistant-polymer",
author="The Home Assistant Authors", author="The Home Assistant Authors",

4
src/layouts/partial-panel-resolver.ts
View File

@ -131,13 +131,13 @@ class PartialPanelResolver extends HassRouterPage {
hass: this.hass, hass: this.hass,
narrow: this.narrow, narrow: this.narrow,
route: this.routeTail, route: this.routeTail,
panel: hass.panels[hass.panelUrl], panel: hass.panels[this._currentPage],
}); });
} else { } else {
el.hass = hass; el.hass = hass;
el.narrow = this.narrow; el.narrow = this.narrow;
el.route = this.routeTail; el.route = this.routeTail;
el.panel = hass.panels[hass.panelUrl]; el.panel = hass.panels[this._currentPage];
} }
} }

9
src/state/disconnect-toast-mixin.ts
View File

@ -22,18 +22,20 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
const oldHass = changedProperties.get("hass"); const oldHass = changedProperties.get("hass");
if ( if (
!changedProperties.has("hass") || !changedProperties.has("hass") ||
!oldHass?.config || oldHass?.config?.state === this.hass!.config.state
oldHass.config.state === this.hass!.config.state
) { ) {
return; return;
} }
if (this.hass!.config.state === STATE_NOT_RUNNING) { if (this.hass!.config.state === STATE_NOT_RUNNING) {
showToast(this, { showToast(this, {
message: this.hass!.localize("ui.notification_toast.starting"), message:
this.hass!.localize("ui.notification_toast.starting") ||
"Home Assistant is starting, not everything will be available until it is finished.",
duration: 0, duration: 0,
dismissable: false, dismissable: false,
}); });
} else if ( } else if (
oldHass?.config &&
oldHass.config.state === STATE_NOT_RUNNING && oldHass.config.state === STATE_NOT_RUNNING &&
(this.hass!.config.state === STATE_STARTING || (this.hass!.config.state === STATE_STARTING ||
this.hass!.config.state === STATE_RUNNING) this.hass!.config.state === STATE_RUNNING)
@ -47,7 +49,6 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
protected hassReconnected() { protected hassReconnected() {
super.hassReconnected(); super.hassReconnected();
showToast(this, { showToast(this, {
message: "", message: "",
duration: 1, duration: 1,