alex/yomichan
1
Fork 0
Code Releases Activity

Improve key press to focus the search query input (#1424)

Browse Source
This commit is contained in:
toasted-nutbread 2021-02-19 21:20:58 -05:00 committed by GitHub
parent 1e927dd66e
commit b9e92a2528
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ext/js/display/search-display-controller.js
View File

@ -109,12 +109,15 @@ class SearchDisplayController {
} }
_onKeyDown(e) { _onKeyDown(e) {
const {activeElement} = document;
if ( if (
document.activeElement !== this._queryInput && activeElement !== this._queryInput &&
!this._isElementInput(activeElement) &&
!e.ctrlKey && !e.ctrlKey &&
!e.metaKey && !e.metaKey &&
!e.altKey && !e.altKey &&
e.key.length === 1 e.key.length === 1 &&
e.key !== ' '
) { ) {
this._queryInput.focus({preventScroll: true}); this._queryInput.focus({preventScroll: true});
} }
@ -425,4 +428,17 @@ class SearchDisplayController {
document.documentElement.dataset.searchMode = (mode !== null ? mode : ''); document.documentElement.dataset.searchMode = (mode !== null ? mode : '');
this._updateClipboardMonitorEnabled(); this._updateClipboardMonitorEnabled();
} }
_isElementInput(element) {
if (element === null) { return false; }
switch (element.tagName.toLowerCase()) {
case 'input':
case 'textarea':
case 'button':
case 'select':
return true;
}
if (element.contentEditable) { return true; }
return false;
}
} }