diff options
| author | toasted-nutbread <toasted-nutbread@users.noreply.github.com> | 2021-01-15 20:19:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 20:19:56 -0500 |
| commit | 0a1664ba296796c347a1690ff5eea71363961806 (patch) | |
| tree | e4b472d2d4bb25552ac0e9beb800ae87c61f59ce /ext/bg | |
| parent | 9f202313c744412c984c136937976bbdf46faaef (diff) | |
Separate close hotkey (#1242)
* Add focusSearchBox hotkey
* Update close hotkey action
* Update hotkeys
Diffstat (limited to 'ext/bg')
| -rw-r--r-- | ext/bg/data/options-schema.json | 3 | ||||
| -rw-r--r-- | ext/bg/js/options.js | 3 | ||||
| -rw-r--r-- | ext/bg/js/search.js | 21 | ||||
| -rw-r--r-- | ext/bg/settings2.html | 3 |
4 files changed, 18 insertions, 12 deletions
diff --git a/ext/bg/data/options-schema.json b/ext/bg/data/options-schema.json index 8c00d455..405d62a9 100644 --- a/ext/bg/data/options-schema.json +++ b/ext/bg/data/options-schema.json @@ -971,7 +971,8 @@ } }, "default": [ - {"action": "close", "key": "Escape", "modifiers": [], "scopes": ["popup", "search"], "enabled": true}, + {"action": "close", "key": "Escape", "modifiers": [], "scopes": ["popup"], "enabled": true}, + {"action": "focusSearchBox", "key": "Escape", "modifiers": [], "scopes": ["search"], "enabled": true}, {"action": "previousEntry3", "key": "PageUp", "modifiers": ["alt"], "scopes": ["popup", "search"], "enabled": true}, {"action": "nextEntry3", "key": "PageDown", "modifiers": ["alt"], "scopes": ["popup", "search"], "enabled": true}, {"action": "lastEntry", "key": "End", "modifiers": ["alt"], "scopes": ["popup", "search"], "enabled": true}, diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js index cbc390da..964c346c 100644 --- a/ext/bg/js/options.js +++ b/ext/bg/js/options.js @@ -716,7 +716,8 @@ class OptionsUtil { profile.options.general.popupActionBarLocation = 'top'; profile.options.inputs = { hotkeys: [ - {action: 'close', key: 'Escape', modifiers: [], scopes: ['popup', 'search'], enabled: true}, + {action: 'close', key: 'Escape', modifiers: [], scopes: ['popup'], enabled: true}, + {action: 'focusSearchBox', key: 'Escape', modifiers: [], scopes: ['search'], enabled: true}, {action: 'previousEntry3', key: 'PageUp', modifiers: ['alt'], scopes: ['popup', 'search'], enabled: true}, {action: 'nextEntry3', key: 'PageDown', modifiers: ['alt'], scopes: ['popup', 'search'], enabled: true}, {action: 'lastEntry', key: 'End', modifiers: ['alt'], scopes: ['popup', 'search'], enabled: true}, diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js index 340b86ce..00148418 100644 --- a/ext/bg/js/search.js +++ b/ext/bg/js/search.js @@ -43,6 +43,10 @@ class DisplaySearch extends Display { } }); this.autoPlayAudioDelay = 0; + + this.registerActions([ + ['focusSearchBox', this._onActionFocusSearchBox.bind(this)] + ]); } async prepare() { @@ -77,15 +81,6 @@ class DisplaySearch extends Display { this._isPrepared = true; } - onEscape() { - if (this._queryInput === null) { - return; - } - - this._queryInput.focus(); - this._queryInput.select(); - } - onKeyDown(e) { if ( !super.onKeyDown(e) && @@ -110,6 +105,14 @@ class DisplaySearch extends Display { return query; } + // Actions + + _onActionFocusSearchBox() { + if (this._queryInput === null) { return; } + this._queryInput.focus(); + this._queryInput.select(); + } + // Private async _onOptionsUpdated() { diff --git a/ext/bg/settings2.html b/ext/bg/settings2.html index f44b7eab..0beef025 100644 --- a/ext/bg/settings2.html +++ b/ext/bg/settings2.html @@ -2871,7 +2871,8 @@ <div class="hotkey-list-item-action-cell"> <select class="hotkey-list-item-action"> <option value="">None</option> - <option value="close">Close popup</option> + <option value="close">Close</option> + <option value="focusSearchBox">Focus search box</option> <option value="nextEntry">Go to next entry</option> <option value="nextEntry3">Go to next entry (x3)</option> <option value="previousEntry">Go to previous entry</option> |