jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-11-09 10:59:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate checks

Browse Source
This commit is contained in:
Aidan Timson
2025-11-04 12:39:02 +00:00
parent 9f394a4ed6
commit cf9f4afcdc
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/state/quick-bar-mixin.ts
View File

@@ -14,7 +14,6 @@ import type { HassElement } from "./hass-element";
import { ShortcutManager } from "../common/keyboard/shortcuts"; import { ShortcutManager } from "../common/keyboard/shortcuts";
import { extractSearchParamsObject } from "../common/url/search-params"; import { extractSearchParamsObject } from "../common/url/search-params";
import { showVoiceCommandDialog } from "../dialogs/voice-command-dialog/show-ha-voice-command-dialog"; import { showVoiceCommandDialog } from "../dialogs/voice-command-dialog/show-ha-voice-command-dialog";
import { canOverrideAlphanumericInput } from "../common/dom/can-override-input";
import { showShortcutsDialog } from "../dialogs/shortcuts/show-shortcuts-dialog"; import { showShortcutsDialog } from "../dialogs/shortcuts/show-shortcuts-dialog";
import type { Redirects } from "../panels/my/ha-panel-my"; import type { Redirects } from "../panels/my/ha-panel-my";
@@ -88,7 +87,6 @@ export default <T extends Constructor<HassElement>>(superClass: T) =>
private _showVoiceCommandDialog(e: KeyboardEvent) { private _showVoiceCommandDialog(e: KeyboardEvent) {
if ( if (
!this.hass?.enableShortcuts || !this.hass?.enableShortcuts ||
!canOverrideAlphanumericInput(e.composedPath()) ||
!this._conversation(this.hass.config.components) !this._conversation(this.hass.config.components)
) { ) {
return; return;
@@ -106,7 +104,7 @@ export default <T extends Constructor<HassElement>>(superClass: T) =>
e: KeyboardEvent, e: KeyboardEvent,
mode: QuickBarMode = QuickBarMode.Entity mode: QuickBarMode = QuickBarMode.Entity
) { ) {
if (!this._canShowQuickBar(e)) { if (!this._canShowQuickBar()) {
return; return;
} }
@@ -119,7 +117,7 @@ export default <T extends Constructor<HassElement>>(superClass: T) =>
} }
private _showShortcutDialog(e: KeyboardEvent) { private _showShortcutDialog(e: KeyboardEvent) {
if (!this._canShowQuickBar(e)) { if (!this._canShowQuickBar()) {
return; return;
} }
@@ -132,10 +130,7 @@ export default <T extends Constructor<HassElement>>(superClass: T) =>
} }
private async _createMyLink(e: KeyboardEvent) { private async _createMyLink(e: KeyboardEvent) {
if ( if (!this.hass?.enableShortcuts) {
!this.hass?.enableShortcuts ||
!canOverrideAlphanumericInput(e.composedPath())
) {
return; return;
} }
@@ -194,11 +189,10 @@ export default <T extends Constructor<HassElement>>(superClass: T) =>
}); });
} }
private _canShowQuickBar(e: KeyboardEvent) { private _canShowQuickBar() {
return ( return (
this.hass?.user?.is_admin && this.hass?.user?.is_admin &&
this.hass.enableShortcuts && this.hass.enableShortcuts
canOverrideAlphanumericInput(e.composedPath())
); );
} }
}; };