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

Merge pull request #3408 from home-assistant/dev

Browse Source 
20190721.1
This commit is contained in:
Paulus Schoutsen 2019-07-21 12:57:30 -07:00 committed by GitHub
commit 973c190bb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 8 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="20190721.0", version="20190721.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",

5
src/components/ha-sidebar.ts
View File

@ -32,7 +32,7 @@ import { classMap } from "lit-html/directives/class-map";
// tslint:disable-next-line: no-duplicate-imports // tslint:disable-next-line: no-duplicate-imports
import { PaperIconItemElement } from "@polymer/paper-item/paper-icon-item"; import { PaperIconItemElement } from "@polymer/paper-item/paper-icon-item";
const SHOW_AFTER_SPACER = ["config", "developer-tools"]; const SHOW_AFTER_SPACER = ["config", "developer-tools", "hassio"];
const SUPPORT_SCROLL_IF_NEEDED = "scrollIntoViewIfNeeded" in document.body; const SUPPORT_SCROLL_IF_NEEDED = "scrollIntoViewIfNeeded" in document.body;
@ -41,7 +41,8 @@ const SORT_VALUE = {
logbook: 2, logbook: 2,
history: 3, history: 3,
"developer-tools": 9, "developer-tools": 9,
configuration: 10, hassio: 10,
configuration: 11,
}; };
const panelSorter = (a, b) => { const panelSorter = (a, b) => {

2
src/dialogs/notifications/notification-drawer.js
View File

@ -36,6 +36,8 @@ export class HuiNotificationDrawer extends EventsMixin(
padding-top: 16px; padding-top: 16px;
height: calc(100% - 65px); height: calc(100% - 65px);
box-sizing: border-box; box-sizing: border-box;
background-color: var(--primary-background-color);
color: var(--primary-text-color);
} }
.notification { .notification {

2
src/html/_js_base.html.template
View File

@ -17,7 +17,7 @@
}; };
if (!("customElements" in window && if (!("customElements" in window &&
"content" in document.createElement("template"))) { "content" in document.createElement("template"))) {
document.write("<script src='/static/polyfills/webcomponents-bundle.js'>"); document.write("<script src='/static/polyfills/webcomponents-bundle.js'><"+"/script>");
} }
var isS101 = /\s+Version\/10\.1(?:\.\d+)?\s+Safari\//.test(navigator.userAgent); var isS101 = /\s+Version\/10\.1(?:\.\d+)?\s+Safari\//.test(navigator.userAgent);
</script> </script>

11
src/layouts/home-assistant-main.ts
View File

@ -44,8 +44,7 @@ class HomeAssistantMain extends LitElement {
return; return;
} }
const sidebarNarrow = const sidebarNarrow = this._sidebarNarrow;
this.narrow || this.hass.dockedSidebar === "always_hidden";
const disableSwipe = const disableSwipe =
!sidebarNarrow || NON_SWIPABLE_PANELS.indexOf(hass.panelUrl) !== -1; !sidebarNarrow || NON_SWIPABLE_PANELS.indexOf(hass.panelUrl) !== -1;
@ -91,7 +90,7 @@ class HomeAssistantMain extends LitElement {
import(/* webpackChunkName: "ha-sidebar" */ "../components/ha-sidebar"); import(/* webpackChunkName: "ha-sidebar" */ "../components/ha-sidebar");
this.addEventListener("hass-toggle-menu", () => { this.addEventListener("hass-toggle-menu", () => {
if (this.narrow || this.hass.dockedSidebar === "always_hidden") { if (this._sidebarNarrow) {
if (this.drawer.opened) { if (this.drawer.opened) {
this.drawer.close(); this.drawer.close();
} else { } else {
@ -120,7 +119,7 @@ class HomeAssistantMain extends LitElement {
this.narrow || this.hass.dockedSidebar !== "auto" this.narrow || this.hass.dockedSidebar !== "auto"
); );
if (changedProps.has("route") && this.narrow) { if (changedProps.has("route") && this._sidebarNarrow) {
this.drawer.close(); this.drawer.close();
} }
@ -136,6 +135,10 @@ class HomeAssistantMain extends LitElement {
this.narrow = ev.detail.value; this.narrow = ev.detail.value;
} }
private get _sidebarNarrow() {
return this.narrow || this.hass.dockedSidebar === "always_hidden";
}
private get drawer(): AppDrawerElement { private get drawer(): AppDrawerElement {
return this.shadowRoot!.querySelector("app-drawer")!; return this.shadowRoot!.querySelector("app-drawer")!;
} }