alex/yomichan
1
Fork 0
Code Releases Activity

Separate close hotkey (#1242)

Browse Source 
* Add focusSearchBox hotkey

* Update close hotkey action

* Update hotkeys
This commit is contained in:
toasted-nutbread 2021-01-15 20:19:56 -05:00 committed by GitHub
parent 9f202313c7
commit 0a1664ba29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 52 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/bg/data/options-schema.json
View File

@ -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},

3
ext/bg/js/options.js
View File

@ -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},

21
ext/bg/js/search.js
View File

@ -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() {

3
ext/bg/settings2.html
View File

@ -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>

41
ext/mixed/js/display.js
View File

@ -116,7 +116,7 @@ class Display extends EventDispatcher {
this._tagNotificationContainer = document.querySelector('#content-footer');
this.registerActions([
['close', () => { this.onEscape(); }],
['close', () => { this.close(); }],
['nextEntry', () => { this._focusEntry(this._index + 1, true); }],
['nextEntry3', () => { this._focusEntry(this._index + 3, true); }],
['previousEntry', () => { this._focusEntry(this._index - 1, true); }],
@ -249,12 +249,6 @@ class Display extends EventDispatcher {
yomichan.logError(error);
}
onEscape() {
if (this._pageType === 'popup') {
this.close();
}
}
onKeyDown(e) {
const key = e.code;
const handlers = this._hotkeys.get(key);
@ -418,8 +412,13 @@ class Display extends EventDispatcher {
}
close() {
if (this._pageType === 'popup') {
this._invokeOwner('closePopup');
switch (this._pageType) {
case 'popup':
this._invokeOwner('closePopup');
break;
case 'search':
this._closeTab();
break;
}
}
@ -1904,4 +1903,28 @@ class Display extends EventDispatcher {
this._registerHotkey(key, modifiers, action);
}
}
async _closeTab() {
const tab = await new Promise((resolve, reject) => {
chrome.tabs.getCurrent((result) => {
const e = chrome.runtime.lastError;
if (e) {
reject(new Error(e.message));
} else {
resolve(result);
}
});
});
const tabId = tab.id;
await new Promise((resolve, reject) => {
chrome.tabs.remove(tabId, () => {
const e = chrome.runtime.lastError;
if (e) {
reject(new Error(e.message));
} else {
resolve();
}
});
});
}
}

3
test/test-options-util.js
View File

@ -440,7 +440,8 @@ function createProfileOptionsUpdatedTestData1() {
},
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},