alex/yomichan
1
Fork 0
Code Releases Activity

Remove the now-unused hotkey forwarding functionality (#1466)

Browse Source
This commit is contained in:
toasted-nutbread 2021-02-28 14:29:43 -05:00 committed by GitHub
parent 75d7e5dc32
commit 704db45e29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/js/display/display.js
View File

@ -895,9 +895,6 @@ class Display extends EventDispatcher {
if (typeof tabId === 'number' && typeof frameId === 'number') { if (typeof tabId === 'number' && typeof frameId === 'number') {
this._contentOriginTabId = tabId; this._contentOriginTabId = tabId;
this._contentOriginFrameId = frameId; this._contentOriginFrameId = frameId;
if (this._pageType === 'popup') {
this._hotkeyHandler.forwardFrameId = (tabId === this._tabId ? frameId : null);
}
contentOriginValid = true; contentOriginValid = true;
} }
} }

51
ext/js/input/hotkey-handler.js
View File

@ -34,22 +34,6 @@ class HotkeyHandler extends EventDispatcher {
this._eventListeners = new EventListenerCollection(); this._eventListeners = new EventListenerCollection();
this._isPrepared = false; this._isPrepared = false;
this._hasEventListeners = false; this._hasEventListeners = false;
this._forwardFrameId = null;
}
/**
* Gets the frame ID used for forwarding hotkeys.
*/
get forwardFrameId() {
return this._forwardFrameId;
}
/**
* Sets the frame ID used for forwarding hotkeys.
*/
set forwardFrameId(value) {
this._forwardFrameId = value;
this._updateHotkeyRegistrations();
} }
/** /**
@ -156,7 +140,7 @@ class HotkeyHandler extends EventDispatcher {
const hotkeyInfo = this._hotkeys.get(key); const hotkeyInfo = this._hotkeys.get(key);
return ( return (
typeof hotkeyInfo !== 'undefined' && typeof hotkeyInfo !== 'undefined' &&
this._invokeHandlers(key, modifiers, hotkeyInfo, false) this._invokeHandlers(modifiers, hotkeyInfo)
); );
} }
@ -173,7 +157,7 @@ class HotkeyHandler extends EventDispatcher {
const hotkeyInfo = this._hotkeys.get(key); const hotkeyInfo = this._hotkeys.get(key);
if (typeof hotkeyInfo !== 'undefined') { if (typeof hotkeyInfo !== 'undefined') {
const eventModifiers = DocumentUtil.getActiveModifiers(e); const eventModifiers = DocumentUtil.getActiveModifiers(e);
if (this._invokeHandlers(key, eventModifiers, hotkeyInfo, false)) { if (this._invokeHandlers(eventModifiers, hotkeyInfo)) {
e.preventDefault(); e.preventDefault();
return; return;
} }
@ -181,7 +165,7 @@ class HotkeyHandler extends EventDispatcher {
this.trigger('keydownNonHotkey', e); this.trigger('keydownNonHotkey', e);
} }
_invokeHandlers(key, modifiers, hotkeyInfo, canForward) { _invokeHandlers(modifiers, hotkeyInfo) {
for (const {modifiers: handlerModifiers, action} of hotkeyInfo.handlers) { for (const {modifiers: handlerModifiers, action} of hotkeyInfo.handlers) {
if (!this._areSame(handlerModifiers, modifiers)) { continue; } if (!this._areSame(handlerModifiers, modifiers)) { continue; }
@ -194,11 +178,6 @@ class HotkeyHandler extends EventDispatcher {
} }
} }
if (canForward && hotkeyInfo.forward) {
this._forwardHotkey(key, modifiers);
return true;
}
return false; return false;
} }
@ -215,26 +194,18 @@ class HotkeyHandler extends EventDispatcher {
_updateHotkeyRegistrations() { _updateHotkeyRegistrations() {
if (this._hotkeys.size === 0 && this._hotkeyRegistrations.size === 0) { return; } if (this._hotkeys.size === 0 && this._hotkeyRegistrations.size === 0) { return; }
const canForward = (this._forwardFrameId !== null);
this._hotkeys.clear(); this._hotkeys.clear();
for (const [scope, registrations] of this._hotkeyRegistrations.entries()) { for (const [scope, registrations] of this._hotkeyRegistrations.entries()) {
for (const {action, key, modifiers, scopes, enabled} of registrations) { for (const {action, key, modifiers, scopes, enabled} of registrations) {
if (!(enabled && key !== null && action !== '')) { continue; } if (!(enabled && key !== null && action !== '' && scopes.includes(scope))) { continue; }
const correctScope = scopes.includes(scope);
if (!correctScope && !canForward) { continue; }
let hotkeyInfo = this._hotkeys.get(key); let hotkeyInfo = this._hotkeys.get(key);
if (typeof hotkeyInfo === 'undefined') { if (typeof hotkeyInfo === 'undefined') {
hotkeyInfo = {handlers: [], forward: false}; hotkeyInfo = {handlers: []};
this._hotkeys.set(key, hotkeyInfo); this._hotkeys.set(key, hotkeyInfo);
} }
if (correctScope) { hotkeyInfo.handlers.push({modifiers: new Set(modifiers), action});
hotkeyInfo.handlers.push({modifiers: new Set(modifiers), action});
} else {
hotkeyInfo.forward = true;
}
} }
} }
this._updateEventHandlers(); this._updateEventHandlers();
@ -252,14 +223,4 @@ class HotkeyHandler extends EventDispatcher {
this._eventListeners.removeAllEventListeners(); this._eventListeners.removeAllEventListeners();
} }
} }
async _forwardHotkey(key, modifiers) {
const frameId = this._forwardFrameId;
if (frameId === null) { throw new Error('No forwarding target'); }
try {
await yomichan.crossFrame.invoke(frameId, 'hotkeyHandler.forwardHotkey', {key, modifiers});
} catch (e) {
// NOP
}
}
} }