alex/yomichan
1
Fork 0
Code Releases Activity

Update how orphan state is observed

Browse Source
This commit is contained in:
toasted-nutbread 2019-12-20 13:44:33 -05:00
parent 2a95f1420f
commit 2519f99f54
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,17 +27,24 @@ class DisplayFloat extends Display {
url: window.location.href
};
this._orphaned = false;
yomichan.on('orphaned', () => this.onOrphaned());
window.addEventListener('message', (e) => this.onMessage(e), false);
}
onError(error) {
if (window.yomichan_orphaned) {
if (this._orphaned) {
this.setContentOrphaned();
} else {
logError(error, true);
}
}
onOrphaned() {
this._orphaned = true;
}
onSearchClear() {
window.parent.postMessage('popupClose', '*');
}

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

@ -37,6 +37,7 @@ class Frontend extends TextScanner {
this.isPreparedPromiseResolve = null;
this.isPreparedPromise = new Promise((resolve) => { this.isPreparedPromiseResolve = resolve; });
this._orphaned = true;
this._lastShowPromise = Promise.resolve();
}
@ -54,6 +55,7 @@ class Frontend extends TextScanner {
try {
await this.updateOptions();
yomichan.on('orphaned', () => this.onOrphaned());
yomichan.on('optionsUpdate', () => this.updateOptions());
chrome.runtime.onMessage.addListener(this.onRuntimeMessage.bind(this));
this.isPreparedPromiseResolve();
@ -93,6 +95,10 @@ class Frontend extends TextScanner {
return false;
}
onOrphaned() {
this._orphaned = true;
}
getMouseEventListeners() {
return [
...super.getMouseEventListeners(),
@ -122,7 +128,7 @@ class Frontend extends TextScanner {
}
}
} catch (e) {
if (window.yomichan_orphaned) {
if (this._orphaned) {
if (textSource !== null && this.options.scanning.modifier !== 'none') {
this._lastShowPromise = this.popup.showContent(
textSource.getRect(),

2
ext/mixed/js/api.js
View File

@ -115,8 +115,8 @@ function _apiInvoke(action, params={}) {
}
});
} catch (e) {
window.yomichan_orphaned = true;
reject(e);
yomichan.triggerOrphaned(e);
}
});
}

8
ext/mixed/js/core.js
View File

@ -244,6 +244,14 @@ const yomichan = (() => {
chrome.runtime.onMessage.addListener(this._onMessage.bind(this));
}
// Public
triggerOrphaned(error) {
this.trigger('orphaned', {error});
}
// Private
_onMessage({action, params}, sender, callback) {
const handler = this._messageHandlers.get(action);
if (typeof handler !== 'function') { return false; }