alex/yomichan
1
Fork 0
Code Releases Activity

Move event handler definitions

Browse Source
This commit is contained in:
toasted-nutbread 2020-02-26 20:02:50 -05:00
parent d08ac02c6a
commit 03ba1b633e
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ext/fg/js/float.js
View File

@ -33,6 +33,24 @@ class DisplayFloat extends Display {
this._messageToken = null; this._messageToken = null;
this._messageTokenPromise = null; this._messageTokenPromise = null;
this._onKeyDownHandlers = new Map([
['C', (e) => {
if (e.ctrlKey && !window.getSelection().toString()) {
this.onSelectionCopy();
return true;
}
return false;
}]
]);
this._windowMessageHandlers = new Map([
['setContent', ({type, details}) => this.setContent(type, details)],
['clearAutoPlayTimer', () => this.clearAutoPlayTimer()],
['setCustomCss', ({css}) => this.setCustomCss(css)],
['prepare', ({options, popupInfo, url, childrenSupported, scale, uniqueId}) => this.prepare(options, popupInfo, url, childrenSupported, scale, uniqueId)],
['setContentScale', ({scale}) => this.setContentScale(scale)]
]);
yomichan.on('orphaned', () => this.onOrphaned()); yomichan.on('orphaned', () => this.onOrphaned());
window.addEventListener('message', (e) => this.onMessage(e), false); window.addEventListener('message', (e) => this.onMessage(e), false);
} }
@ -98,9 +116,9 @@ class DisplayFloat extends Display {
onKeyDown(e) { onKeyDown(e) {
const key = Display.getKeyFromEvent(e); const key = Display.getKeyFromEvent(e);
const handler = DisplayFloat._onKeyDownHandlers.get(key); const handler = this._onKeyDownHandlers.get(key);
if (typeof handler === 'function') { if (typeof handler === 'function') {
if (handler(this, e)) { if (handler(e)) {
e.preventDefault(); e.preventDefault();
return true; return true;
} }
@ -126,10 +144,10 @@ class DisplayFloat extends Display {
return; return;
} }
const handler = DisplayFloat._messageHandlers.get(action); const handler = this._windowMessageHandlers.get(action);
if (typeof handler !== 'function') { return; } if (typeof handler !== 'function') { return; }
handler(this, params); handler(params);
} }
getOptionsContext() { getOptionsContext() {
@ -153,22 +171,4 @@ class DisplayFloat extends Display {
} }
} }
DisplayFloat._onKeyDownHandlers = new Map([
['C', (self, e) => {
if (e.ctrlKey && !window.getSelection().toString()) {
self.onSelectionCopy();
return true;
}
return false;
}]
]);
DisplayFloat._messageHandlers = new Map([
['setContent', (self, {type, details}) => self.setContent(type, details)],
['clearAutoPlayTimer', (self) => self.clearAutoPlayTimer()],
['setCustomCss', (self, {css}) => self.setCustomCss(css)],
['prepare', (self, {options, popupInfo, url, childrenSupported, scale, uniqueId}) => self.prepare(options, popupInfo, url, childrenSupported, scale, uniqueId)],
['setContentScale', (self, {scale}) => self.setContentScale(scale)]
]);
DisplayFloat.instance = new DisplayFloat(); DisplayFloat.instance = new DisplayFloat();