alex/yomichan
1
Fork 0
Code Releases Activity

Reorganize popup public functions to match popup proxy

Browse Source
This commit is contained in:
toasted-nutbread 2019-12-15 20:11:32 -05:00
parent 8164ccfbfc
commit 4014bbab42
1 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
ext/fg/js/popup.js
View File

@ -48,6 +48,63 @@ class Popup {
return window.location.href; return window.location.href;
} }
// Public functions
async setOptions(options) {
this.options = options;
this.updateTheme();
}
hide(changeFocus) {
if (!this.isVisible()) {
return;
}
this.setVisible(false);
if (this.child !== null) {
this.child.hide(false);
}
if (changeFocus) {
this.focusParent();
}
}
async isVisibleAsync() {
return this.isVisible();
}
setVisibleOverride(visible) {
this.visibleOverride = visible;
this.updateVisibility();
}
async containsPoint(x, y) {
for (let popup = this; popup !== null && popup.isVisible(); popup = popup.child) {
const rect = popup.container.getBoundingClientRect();
if (x >= rect.left && y >= rect.top && x < rect.right && y < rect.bottom) {
return true;
}
}
return false;
}
async showContent(elementRect, writingMode, type=null, details=null) {
if (!this.isInitialized()) { return; }
await this.show(elementRect, writingMode);
if (type === null) { return; }
this.invokeApi('setContent', {type, details});
}
async setCustomCss(css) {
this.invokeApi('setCustomCss', {css});
}
clearAutoPlayTimer() {
if (this.isInjected) {
this.invokeApi('clearAutoPlayTimer');
}
}
inject() { inject() {
if (this.injectPromise === null) { if (this.injectPromise === null) {
this.injectPromise = this.createInjectPromise(); this.injectPromise = this.createInjectPromise();
@ -91,18 +148,6 @@ class Popup {
return this.options !== null; return this.options !== null;
} }
async setOptions(options) {
this.options = options;
this.updateTheme();
}
async showContent(elementRect, writingMode, type=null, details=null) {
if (!this.isInitialized()) { return; }
await this.show(elementRect, writingMode);
if (type === null) { return; }
this.invokeApi('setContent', {type, details});
}
async show(elementRect, writingMode) { async show(elementRect, writingMode) {
await this.inject(); await this.inject();
@ -138,24 +183,6 @@ class Popup {
} }
} }
hide(changeFocus) {
if (!this.isVisible()) {
return;
}
this.setVisible(false);
if (this.child !== null) {
this.child.hide(false);
}
if (changeFocus) {
this.focusParent();
}
}
async isVisibleAsync() {
return this.isVisible();
}
isVisible() { isVisible() {
return this.isInjected && (this.visibleOverride !== null ? this.visibleOverride : this.visible); return this.isInjected && (this.visibleOverride !== null ? this.visibleOverride : this.visible);
} }
@ -165,11 +192,6 @@ class Popup {
this.updateVisibility(); this.updateVisibility();
} }
setVisibleOverride(visible) {
this.visibleOverride = visible;
this.updateVisibility();
}
updateVisibility() { updateVisibility() {
this.container.style.setProperty('visibility', this.isVisible() ? 'visible' : 'hidden', 'important'); this.container.style.setProperty('visibility', this.isVisible() ? 'visible' : 'hidden', 'important');
} }
@ -203,20 +225,6 @@ class Popup {
return dark ? 'dark' : 'light'; return dark ? 'dark' : 'light';
} }
async containsPoint(x, y) {
for (let popup = this; popup !== null && popup.isVisible(); popup = popup.child) {
const rect = popup.container.getBoundingClientRect();
if (x >= rect.left && y >= rect.top && x < rect.right && y < rect.bottom) {
return true;
}
}
return false;
}
async setCustomCss(css) {
this.invokeApi('setCustomCss', {css});
}
async setCustomOuterCss(css, injectDirectly) { async setCustomOuterCss(css, injectDirectly) {
// Cannot repeatedly inject stylesheets using web extension APIs since there is no way to remove them. // Cannot repeatedly inject stylesheets using web extension APIs since there is no way to remove them.
if (this.stylesheetInjectedViaApi) { return; } if (this.stylesheetInjectedViaApi) { return; }
@ -234,12 +242,6 @@ class Popup {
} }
} }
clearAutoPlayTimer() {
if (this.isInjected) {
this.invokeApi('clearAutoPlayTimer');
}
}
invokeApi(action, params={}) { invokeApi(action, params={}) {
this.container.contentWindow.postMessage({action, params}, '*'); this.container.contentWindow.postMessage({action, params}, '*');
} }