From efe390f68dc85f1fc93eabe4a8a8184125e906d8 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 27 Jul 2020 16:04:31 +0200 Subject: [PATCH] allow searching for hotkey values - #1509 --- terminus-settings/src/components/settingsTab.component.pug | 2 +- terminus-settings/src/components/settingsTab.component.ts | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/terminus-settings/src/components/settingsTab.component.pug b/terminus-settings/src/components/settingsTab.component.pug index 0e7ce9a1..841e8744 100644 --- a/terminus-settings/src/components/settingsTab.component.pug +++ b/terminus-settings/src/components/settingsTab.component.pug @@ -288,7 +288,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab') th ID th Hotkey ng-container(*ngFor='let hotkey of hotkeyDescriptions') - tr(*ngIf='!hotkeyFilter || hotkey.name.toLowerCase().includes(hotkeyFilter.toLowerCase())') + tr(*ngIf='!hotkeyFilter || hotkeyFilterFn(hotkey, hotkeyFilter)') td {{hotkey.name}} td {{hotkey.id}} td.pr-5 diff --git a/terminus-settings/src/components/settingsTab.component.ts b/terminus-settings/src/components/settingsTab.component.ts index 1537fd1b..4f26efd2 100644 --- a/terminus-settings/src/components/settingsTab.component.ts +++ b/terminus-settings/src/components/settingsTab.component.ts @@ -144,4 +144,10 @@ export class SettingsTabComponent extends BaseTabComponent { } ptr[prop] = value } + + hotkeyFilterFn (hotkey: HotkeyDescription, query: string): boolean { + // eslint-disable-next-line @typescript-eslint/restrict-plus-operands + const s = hotkey.name + (this.getHotkey(hotkey.id) || []).toString() as string + return s.toLowerCase().includes(query.toLowerCase()) + } }