Only let "/" be a shortcut for search if the page overall has focus NOT an input. Fixes #81

brondsem · brondsem · commit e8314be26385 · 2025-04-24T17:48:28.000-04:00
diff --git a/switchboard/admin/index.tpl b/switchboard/admin/index.tpl
@@ -863,7 +863,7 @@
         });
 
         window.addEventListener("keydown", (e) => {
-          if (!$('input[type=search]').is(':focus') && (e.code === 'F3' || e.code === 'Slash' || ((e.ctrlKey || e.metaKey) && e.code === 'KeyF'))) {
+          if (!$('input[type=search]').is(':focus') && (e.code === 'F3' || (e.code === 'Slash' && document.activeElement === document.body) || ((e.ctrlKey || e.metaKey) && e.code === 'KeyF'))) {
             e.preventDefault();
             $('input[type=search]').focus();
           }

Original file line number	Diff line number	Diff line change
`@@ -863,7 +863,7 @@`
`863`	`863`	`});`
`864`	`864`
`865`	`865`	`window.addEventListener("keydown", (e) => {`
`866`		`- if (!$('input[type=search]').is(':focus') && (e.code === 'F3' \|\| e.code === 'Slash' \|\| ((e.ctrlKey \|\| e.metaKey) && e.code === 'KeyF'))) {`
	`866`	`+ if (!$('input[type=search]').is(':focus') && (e.code === 'F3' \|\| (e.code === 'Slash' && document.activeElement === document.body) \|\| ((e.ctrlKey \|\| e.metaKey) && e.code === 'KeyF'))) {`
`867`	`867`	`e.preventDefault();`
`868`	`868`	`$('input[type=search]').focus();`
`869`	`869`	`}`