alex/yomichan
1
Fork 0
Code Releases Activity

Frontend refactor (#508)

Browse Source 
* Use this.popup instead of this.frontend.popup

* Rename Frontend.popup to _popup

* Make Frontend functions private

* Clean up Frontend constructor
This commit is contained in:
toasted-nutbread 2020-05-06 19:35:36 -04:00 committed by GitHub
parent d6ae322961
commit 38d6f58fac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/bg/js/settings/popup-preview-frame.js
View File

@ -120,7 +120,7 @@ class SettingsPopupPreview {
} }
this.themeChangeTimeout = setTimeout(() => { this.themeChangeTimeout = setTimeout(() => {
this.themeChangeTimeout = null; this.themeChangeTimeout = null;
this.frontend.popup.updateTheme(); this.popup.updateTheme();
}, 300); }, 300);
} }
@ -141,12 +141,12 @@ class SettingsPopupPreview {
setCustomCss(css) { setCustomCss(css) {
if (this.frontend === null) { return; } if (this.frontend === null) { return; }
this.frontend.popup.setCustomCss(css); this.popup.setCustomCss(css);
} }
setCustomOuterCss(css) { setCustomOuterCss(css) {
if (this.frontend === null) { return; } if (this.frontend === null) { return; }
this.frontend.popup.setCustomOuterCss(css, false); this.popup.setCustomOuterCss(css, false);
} }
async updateOptionsContext(optionsContext) { async updateOptionsContext(optionsContext) {
@ -174,7 +174,7 @@ class SettingsPopupPreview {
this.textSource = source; this.textSource = source;
await this.frontend.showContentCompleted(); await this.frontend.showContentCompleted();
if (this.frontend.popup.isVisibleSync()) { if (this.popup.isVisibleSync()) {
this.popupShown = true; this.popupShown = true;
} }

111
ext/fg/js/frontend.js
View File

@ -28,30 +28,23 @@
class Frontend { class Frontend {
constructor(popup, getUrl=null) { constructor(popup, getUrl=null) {
this._id = yomichan.generateId(16); this._id = yomichan.generateId(16);
this._popup = popup;
this.popup = popup;
this._getUrl = getUrl; this._getUrl = getUrl;
this._disabledOverride = false; this._disabledOverride = false;
this._options = null; this._options = null;
this._pageZoomFactor = 1.0; this._pageZoomFactor = 1.0;
this._contentScale = 1.0; this._contentScale = 1.0;
this._orphaned = false; this._orphaned = false;
this._lastShowPromise = Promise.resolve(); this._lastShowPromise = Promise.resolve();
this._enabledEventListeners = new EventListenerCollection(); this._enabledEventListeners = new EventListenerCollection();
this._textScanner = new TextScanner(
window,
() => this.popup.isProxy() ? [] : [this.popup.getContainer()],
[(x, y) => this.popup.containsPoint(x, y)]
);
this._textScanner.onSearchSource = this.onSearchSource.bind(this);
this._activeModifiers = new Set(); this._activeModifiers = new Set();
this._optionsUpdatePending = false; this._optionsUpdatePending = false;
this._textScanner = new TextScanner(
window,
() => this._popup.isProxy() ? [] : [this._popup.getContainer()],
[(x, y) => this._popup.containsPoint(x, y)]
);
this._textScanner.onSearchSource = this._onSearchSource.bind(this);
this._windowMessageHandlers = new Map([ this._windowMessageHandlers = new Map([
['popupClose', () => this._textScanner.clearSelection(false)], ['popupClose', () => this._textScanner.clearSelection(false)],
@ -59,7 +52,7 @@ class Frontend {
]); ]);
this._runtimeMessageHandlers = new Map([ this._runtimeMessageHandlers = new Map([
['popupSetVisibleOverride', ({visible}) => { this.popup.setVisibleOverride(visible); }], ['popupSetVisibleOverride', ({visible}) => { this._popup.setVisibleOverride(visible); }],
['rootPopupRequestInformationBroadcast', () => { this._broadcastRootPopupInformation(); }], ['rootPopupRequestInformationBroadcast', () => { this._broadcastRootPopupInformation(); }],
['requestDocumentInformationBroadcast', ({uniqueId}) => { this._broadcastDocumentInformation(uniqueId); }] ['requestDocumentInformationBroadcast', ({uniqueId}) => { this._broadcastDocumentInformation(uniqueId); }]
]); ]);
@ -79,21 +72,21 @@ class Frontend {
const {zoomFactor} = await apiGetZoom(); const {zoomFactor} = await apiGetZoom();
this._pageZoomFactor = zoomFactor; this._pageZoomFactor = zoomFactor;
window.addEventListener('resize', this.onResize.bind(this), false); window.addEventListener('resize', this._onResize.bind(this), false);
const visualViewport = window.visualViewport; const visualViewport = window.visualViewport;
if (visualViewport !== null && typeof visualViewport === 'object') { if (visualViewport !== null && typeof visualViewport === 'object') {
window.visualViewport.addEventListener('scroll', this.onVisualViewportScroll.bind(this)); window.visualViewport.addEventListener('scroll', this._onVisualViewportScroll.bind(this));
window.visualViewport.addEventListener('resize', this.onVisualViewportResize.bind(this)); window.visualViewport.addEventListener('resize', this._onVisualViewportResize.bind(this));
} }
yomichan.on('orphaned', this.onOrphaned.bind(this)); yomichan.on('orphaned', this._onOrphaned.bind(this));
yomichan.on('optionsUpdated', this.updateOptions.bind(this)); yomichan.on('optionsUpdated', this.updateOptions.bind(this));
yomichan.on('zoomChanged', this.onZoomChanged.bind(this)); yomichan.on('zoomChanged', this._onZoomChanged.bind(this));
chrome.runtime.onMessage.addListener(this.onRuntimeMessage.bind(this)); chrome.runtime.onMessage.addListener(this._onRuntimeMessage.bind(this));
this._textScanner.on('clearSelection', this.onClearSelection.bind(this)); this._textScanner.on('clearSelection', this._onClearSelection.bind(this));
this._textScanner.on('activeModifiersChanged', this.onActiveModifiersChanged.bind(this)); this._textScanner.on('activeModifiersChanged', this._onActiveModifiersChanged.bind(this));
this._updateContentScale(); this._updateContentScale();
this._broadcastRootPopupInformation(); this._broadcastRootPopupInformation();
@ -102,11 +95,11 @@ class Frontend {
} }
} }
onResize() { _onResize() {
this._updatePopupPosition(); this._updatePopupPosition();
} }
onWindowMessage(e) { _onWindowMessage(e) {
const action = e.data; const action = e.data;
const handler = this._windowMessageHandlers.get(action); const handler = this._windowMessageHandlers.get(action);
if (typeof handler !== 'function') { return false; } if (typeof handler !== 'function') { return false; }
@ -114,9 +107,9 @@ class Frontend {
handler(); handler();
} }
onRuntimeMessage({action, params}, sender, callback) { _onRuntimeMessage({action, params}, sender, callback) {
const {targetPopupId} = params || {}; const {targetPopupId} = params || {};
if (typeof targetPopupId !== 'undefined' && targetPopupId !== this.popup.id) { return; } if (typeof targetPopupId !== 'undefined' && targetPopupId !== this._popup.id) { return; }
const handler = this._runtimeMessageHandlers.get(action); const handler = this._runtimeMessageHandlers.get(action);
if (typeof handler !== 'function') { return false; } if (typeof handler !== 'function') { return false; }
@ -126,20 +119,20 @@ class Frontend {
return false; return false;
} }
onOrphaned() { _onOrphaned() {
this._orphaned = true; this._orphaned = true;
} }
onZoomChanged({newZoomFactor}) { _onZoomChanged({newZoomFactor}) {
this._pageZoomFactor = newZoomFactor; this._pageZoomFactor = newZoomFactor;
this._updateContentScale(); this._updateContentScale();
} }
onVisualViewportScroll() { _onVisualViewportScroll() {
this._updatePopupPosition(); this._updatePopupPosition();
} }
onVisualViewportResize() { _onVisualViewportResize() {
this._updateContentScale(); this._updateContentScale();
} }
@ -150,7 +143,7 @@ class Frontend {
async setPopup(popup) { async setPopup(popup) {
this._textScanner.clearSelection(true); this._textScanner.clearSelection(true);
this.popup = popup; this._popup = popup;
await popup.setOptionsContext(await this.getOptionsContext(), this._id); await popup.setOptionsContext(await this.getOptionsContext(), this._id);
} }
@ -166,18 +159,18 @@ class Frontend {
} }
this._textScanner.ignoreNodes = ignoreNodes.join(','); this._textScanner.ignoreNodes = ignoreNodes.join(',');
await this.popup.setOptionsContext(optionsContext, this._id); await this._popup.setOptionsContext(optionsContext, this._id);
this._updateContentScale(); this._updateContentScale();
const textSourceCurrent = this._textScanner.getCurrentTextSource(); const textSourceCurrent = this._textScanner.getCurrentTextSource();
const causeCurrent = this._textScanner.causeCurrent; const causeCurrent = this._textScanner.causeCurrent;
if (textSourceCurrent !== null && causeCurrent !== null) { if (textSourceCurrent !== null && causeCurrent !== null) {
await this.onSearchSource(textSourceCurrent, causeCurrent); await this._onSearchSource(textSourceCurrent, causeCurrent);
} }
} }
async updatePendingOptions() { async _updatePendingOptions() {
if (this._optionsUpdatePending) { if (this._optionsUpdatePending) {
this._optionsUpdatePending = false; this._optionsUpdatePending = false;
await this.updateOptions(); await this.updateOptions();
@ -185,12 +178,12 @@ class Frontend {
} }
async setTextSource(textSource) { async setTextSource(textSource) {
await this.onSearchSource(textSource, 'script'); await this._onSearchSource(textSource, 'script');
this._textScanner.setCurrentTextSource(textSource); this._textScanner.setCurrentTextSource(textSource);
} }
async onSearchSource(textSource, cause) { async _onSearchSource(textSource, cause) {
await this.updatePendingOptions(); await this._updatePendingOptions();
let results = null; let results = null;
@ -198,12 +191,12 @@ class Frontend {
if (textSource !== null) { if (textSource !== null) {
const optionsContext = await this.getOptionsContext(); const optionsContext = await this.getOptionsContext();
results = ( results = (
await this.findTerms(textSource, optionsContext) || await this._findTerms(textSource, optionsContext) ||
await this.findKanji(textSource, optionsContext) await this._findKanji(textSource, optionsContext)
); );
if (results !== null) { if (results !== null) {
const focus = (cause === 'mouse'); const focus = (cause === 'mouse');
this.showContent(textSource, focus, results.definitions, results.type, optionsContext); this._showContent(textSource, focus, results.definitions, results.type, optionsContext);
} }
} }
} catch (e) { } catch (e) {
@ -223,7 +216,7 @@ class Frontend {
return results; return results;
} }
showContent(textSource, focus, definitions, type, optionsContext) { _showContent(textSource, focus, definitions, type, optionsContext) {
const {url} = optionsContext; const {url} = optionsContext;
const sentence = docSentenceExtract(textSource, this._options.anki.sentenceExt); const sentence = docSentenceExtract(textSource, this._options.anki.sentenceExt);
this._showPopupContent( this._showPopupContent(
@ -238,7 +231,7 @@ class Frontend {
return this._lastShowPromise; return this._lastShowPromise;
} }
async findTerms(textSource, optionsContext) { async _findTerms(textSource, optionsContext) {
const searchText = this._textScanner.getTextSourceContent(textSource, this._options.scanning.length); const searchText = this._textScanner.getTextSourceContent(textSource, this._options.scanning.length);
if (searchText.length === 0) { return null; } if (searchText.length === 0) { return null; }
@ -250,7 +243,7 @@ class Frontend {
return {definitions, type: 'terms'}; return {definitions, type: 'terms'};
} }
async findKanji(textSource, optionsContext) { async _findKanji(textSource, optionsContext) {
const searchText = this._textScanner.getTextSourceContent(textSource, 1); const searchText = this._textScanner.getTextSourceContent(textSource, 1);
if (searchText.length === 0) { return null; } if (searchText.length === 0) { return null; }
@ -262,16 +255,16 @@ class Frontend {
return {definitions, type: 'kanji'}; return {definitions, type: 'kanji'};
} }
onClearSelection({passive}) { _onClearSelection({passive}) {
this.popup.hide(!passive); this._popup.hide(!passive);
this.popup.clearAutoPlayTimer(); this._popup.clearAutoPlayTimer();
this.updatePendingOptions(); this._updatePendingOptions();
} }
async onActiveModifiersChanged({modifiers}) { async _onActiveModifiersChanged({modifiers}) {
if (areSetsEqual(modifiers, this._activeModifiers)) { return; } if (areSetsEqual(modifiers, this._activeModifiers)) { return; }
this._activeModifiers = modifiers; this._activeModifiers = modifiers;
if (await this.popup.isVisible()) { if (await this._popup.isVisible()) {
this._optionsUpdatePending = true; this._optionsUpdatePending = true;
return; return;
} }
@ -280,14 +273,14 @@ class Frontend {
async getOptionsContext() { async getOptionsContext() {
const url = this._getUrl !== null ? await this._getUrl() : window.location.href; const url = this._getUrl !== null ? await this._getUrl() : window.location.href;
const depth = this.popup.depth; const depth = this._popup.depth;
const modifierKeys = [...this._activeModifiers]; const modifierKeys = [...this._activeModifiers];
return {depth, url, modifierKeys}; return {depth, url, modifierKeys};
} }
_showPopupContent(textSource, optionsContext, type=null, details=null) { _showPopupContent(textSource, optionsContext, type=null, details=null) {
const context = {optionsContext, source: this._id}; const context = {optionsContext, source: this._id};
this._lastShowPromise = this.popup.showContent( this._lastShowPromise = this._popup.showContent(
textSource.getRect(), textSource.getRect(),
textSource.getWritingMode(), textSource.getWritingMode(),
type, type,
@ -300,13 +293,13 @@ class Frontend {
_updateTextScannerEnabled() { _updateTextScannerEnabled() {
const enabled = ( const enabled = (
this._options.general.enable && this._options.general.enable &&
this.popup.depth <= this._options.scanning.popupNestingMaxDepth && this._popup.depth <= this._options.scanning.popupNestingMaxDepth &&
!this._disabledOverride !this._disabledOverride
); );
this._enabledEventListeners.removeAllEventListeners(); this._enabledEventListeners.removeAllEventListeners();
this._textScanner.setEnabled(enabled); this._textScanner.setEnabled(enabled);
if (enabled) { if (enabled) {
this._enabledEventListeners.addEventListener(window, 'message', this.onWindowMessage.bind(this)); this._enabledEventListeners.addEventListener(window, 'message', this._onWindowMessage.bind(this));
} }
} }
@ -324,27 +317,27 @@ class Frontend {
if (contentScale === this._contentScale) { return; } if (contentScale === this._contentScale) { return; }
this._contentScale = contentScale; this._contentScale = contentScale;
this.popup.setContentScale(this._contentScale); this._popup.setContentScale(this._contentScale);
this._updatePopupPosition(); this._updatePopupPosition();
} }
_broadcastRootPopupInformation() { _broadcastRootPopupInformation() {
if (!this.popup.isProxy() && this.popup.depth === 0 && this.popup.frameId === 0) { if (!this._popup.isProxy() && this._popup.depth === 0 && this._popup.frameId === 0) {
apiBroadcastTab('rootPopupInformation', {popupId: this.popup.id, frameId: this.popup.frameId}); apiBroadcastTab('rootPopupInformation', {popupId: this._popup.id, frameId: this._popup.frameId});
} }
} }
_broadcastDocumentInformation(uniqueId) { _broadcastDocumentInformation(uniqueId) {
apiBroadcastTab('documentInformationBroadcast', { apiBroadcastTab('documentInformationBroadcast', {
uniqueId, uniqueId,
frameId: this.popup.frameId, frameId: this._popup.frameId,
title: document.title title: document.title
}); });
} }
async _updatePopupPosition() { async _updatePopupPosition() {
const textSource = this._textScanner.getCurrentTextSource(); const textSource = this._textScanner.getCurrentTextSource();
if (textSource !== null && await this.popup.isVisible()) { if (textSource !== null && await this._popup.isVisible()) {
this._showPopupContent(textSource, await this.getOptionsContext()); this._showPopupContent(textSource, await this.getOptionsContext());
} }
} }