From a889969bb8eee62fe44ea98b20ea6bc925787c0e Mon Sep 17 00:00:00 2001 From: Zack Barett Date: Tue, 6 Sep 2022 20:53:09 -0500 Subject: [PATCH] Fix Back button on Safari and disable information menu item until saved (#13633) --- src/panels/config/automation/ha-automation-editor.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts index 1e0a0dba43..4d6c04c005 100644 --- a/src/panels/config/automation/ha-automation-editor.ts +++ b/src/panels/config/automation/ha-automation-editor.ts @@ -31,6 +31,7 @@ import { classMap } from "lit/directives/class-map"; import { fireEvent } from "../../../common/dom/fire_event"; import { navigate } from "../../../common/navigate"; import { copyToClipboard } from "../../../common/util/copy-clipboard"; +import { afterNextRender } from "../../../common/util/render-status"; import "../../../components/ha-button-menu"; import "../../../components/ha-card"; import "../../../components/ha-fab"; @@ -153,7 +154,11 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) { .path=${mdiDotsVertical} > - + ${this.hass.localize("ui.panel.config.automation.editor.show_info")} { - setTimeout(() => history.back()); + afterNextRender(() => history.back()); }, }); } else { - history.back(); + afterNextRender(() => history.back()); } };