alex/yomichan
1
Fork 0
Code Releases Activity

Mark private functions

Browse Source
This commit is contained in:
toasted-nutbread 2019-12-15 20:54:20 -05:00
parent 44bde5c676
commit c3ea952844
1 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ class Popup {
this.visibleOverride = null; this.visibleOverride = null;
this.options = null; this.options = null;
this.stylesheetInjectedViaApi = false; this.stylesheetInjectedViaApi = false;
this.updateVisibility(); this._updateVisibility();
} }
// Public properties // Public properties
@ -60,12 +60,12 @@ class Popup {
return; return;
} }
this.setVisible(false); this._setVisible(false);
if (this.child !== null) { if (this.child !== null) {
this.child.hide(false); this.child.hide(false);
} }
if (changeFocus) { if (changeFocus) {
this.focusParent(); this._focusParent();
} }
} }
@ -75,7 +75,7 @@ class Popup {
setVisibleOverride(visible) { setVisibleOverride(visible) {
this.visibleOverride = visible; this.visibleOverride = visible;
this.updateVisibility(); this._updateVisibility();
} }
async containsPoint(x, y) { async containsPoint(x, y) {
@ -89,19 +89,19 @@ class Popup {
} }
async showContent(elementRect, writingMode, type=null, details=null) { async showContent(elementRect, writingMode, type=null, details=null) {
if (!this.isInitialized()) { return; } if (!this._isInitialized()) { return; }
await this.show(elementRect, writingMode); await this._show(elementRect, writingMode);
if (type === null) { return; } if (type === null) { return; }
this.invokeApi('setContent', {type, details}); this._invokeApi('setContent', {type, details});
} }
async setCustomCss(css) { async setCustomCss(css) {
this.invokeApi('setCustomCss', {css}); this._invokeApi('setCustomCss', {css});
} }
clearAutoPlayTimer() { clearAutoPlayTimer() {
if (this.isInjected) { if (this.isInjected) {
this.invokeApi('clearAutoPlayTimer'); this._invokeApi('clearAutoPlayTimer');
} }
} }
@ -113,14 +113,14 @@ class Popup {
updateTheme() { updateTheme() {
this.container.dataset.yomichanTheme = this.options.general.popupOuterTheme; this.container.dataset.yomichanTheme = this.options.general.popupOuterTheme;
this.container.dataset.yomichanSiteColor = this.getSiteColor(); this.container.dataset.yomichanSiteColor = this._getSiteColor();
} }
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; }
if (injectDirectly || Popup.isOnExtensionPage()) { if (injectDirectly || Popup._isOnExtensionPage()) {
Popup.injectOuterStylesheet(css); Popup.injectOuterStylesheet(css);
} else { } else {
if (!css) { return; } if (!css) { return; }
@ -153,14 +153,16 @@ class Popup {
} }
} }
inject() { // Private functions
_inject() {
if (this.injectPromise === null) { if (this.injectPromise === null) {
this.injectPromise = this.createInjectPromise(); this.injectPromise = this._createInjectPromise();
} }
return this.injectPromise; return this.injectPromise;
} }
async createInjectPromise() { async _createInjectPromise() {
try { try {
const {frameId} = await this.frameIdPromise; const {frameId} = await this.frameIdPromise;
if (typeof frameId === 'number') { if (typeof frameId === 'number') {
@ -173,7 +175,7 @@ class Popup {
return new Promise((resolve) => { return new Promise((resolve) => {
const parentFrameId = (typeof this.frameId === 'number' ? this.frameId : null); const parentFrameId = (typeof this.frameId === 'number' ? this.frameId : null);
this.container.addEventListener('load', () => { this.container.addEventListener('load', () => {
this.invokeApi('initialize', { this._invokeApi('initialize', {
options: this.options, options: this.options,
popupInfo: { popupInfo: {
id: this.id, id: this.id,
@ -185,27 +187,27 @@ class Popup {
}); });
resolve(); resolve();
}); });
this.observeFullscreen(); this._observeFullscreen();
this.onFullscreenChanged(); this._onFullscreenChanged();
this.setCustomOuterCss(this.options.general.customPopupOuterCss, false); this.setCustomOuterCss(this.options.general.customPopupOuterCss, false);
this.isInjected = true; this.isInjected = true;
}); });
} }
isInitialized() { _isInitialized() {
return this.options !== null; return this.options !== null;
} }
async show(elementRect, writingMode) { async _show(elementRect, writingMode) {
await this.inject(); await this._inject();
const optionsGeneral = this.options.general; const optionsGeneral = this.options.general;
const container = this.container; const container = this.container;
const containerRect = container.getBoundingClientRect(); const containerRect = container.getBoundingClientRect();
const getPosition = ( const getPosition = (
writingMode === 'horizontal-tb' || optionsGeneral.popupVerticalTextPosition === 'default' ? writingMode === 'horizontal-tb' || optionsGeneral.popupVerticalTextPosition === 'default' ?
Popup.getPositionForHorizontalText : Popup._getPositionForHorizontalText :
Popup.getPositionForVerticalText Popup._getPositionForVerticalText
); );
const [x, y, width, height, below] = getPosition( const [x, y, width, height, below] = getPosition(
@ -225,22 +227,22 @@ class Popup {
container.style.width = `${width}px`; container.style.width = `${width}px`;
container.style.height = `${height}px`; container.style.height = `${height}px`;
this.setVisible(true); this._setVisible(true);
if (this.child !== null) { if (this.child !== null) {
this.child.hide(true); this.child.hide(true);
} }
} }
setVisible(visible) { _setVisible(visible) {
this.visible = visible; this.visible = visible;
this.updateVisibility(); this._updateVisibility();
} }
updateVisibility() { _updateVisibility() {
this.container.style.setProperty('visibility', this.isVisible() ? 'visible' : 'hidden', 'important'); this.container.style.setProperty('visibility', this.isVisible() ? 'visible' : 'hidden', 'important');
} }
focusParent() { _focusParent() {
if (this.parent !== null) { if (this.parent !== null) {
// Chrome doesn't like focusing iframe without contentWindow. // Chrome doesn't like focusing iframe without contentWindow.
const contentWindow = this.parent.container.contentWindow; const contentWindow = this.parent.container.contentWindow;
@ -256,19 +258,19 @@ class Popup {
} }
} }
getSiteColor() { _getSiteColor() {
const color = [255, 255, 255]; const color = [255, 255, 255];
Popup.addColor(color, Popup.getColorInfo(window.getComputedStyle(document.documentElement).backgroundColor)); Popup._addColor(color, Popup._getColorInfo(window.getComputedStyle(document.documentElement).backgroundColor));
Popup.addColor(color, Popup.getColorInfo(window.getComputedStyle(document.body).backgroundColor)); Popup._addColor(color, Popup._getColorInfo(window.getComputedStyle(document.body).backgroundColor));
const dark = (color[0] < 128 && color[1] < 128 && color[2] < 128); const dark = (color[0] < 128 && color[1] < 128 && color[2] < 128);
return dark ? 'dark' : 'light'; return dark ? 'dark' : 'light';
} }
invokeApi(action, params={}) { _invokeApi(action, params={}) {
this.container.contentWindow.postMessage({action, params}, '*'); this.container.contentWindow.postMessage({action, params}, '*');
} }
observeFullscreen() { _observeFullscreen() {
const fullscreenEvents = [ const fullscreenEvents = [
'fullscreenchange', 'fullscreenchange',
'MSFullscreenChange', 'MSFullscreenChange',
@ -276,11 +278,11 @@ class Popup {
'webkitfullscreenchange' 'webkitfullscreenchange'
]; ];
for (const eventName of fullscreenEvents) { for (const eventName of fullscreenEvents) {
document.addEventListener(eventName, () => this.onFullscreenChanged(), false); document.addEventListener(eventName, () => this._onFullscreenChanged(), false);
} }
} }
getFullscreenElement() { _getFullscreenElement() {
return ( return (
document.fullscreenElement || document.fullscreenElement ||
document.msFullscreenElement || document.msFullscreenElement ||
@ -289,14 +291,14 @@ class Popup {
); );
} }
onFullscreenChanged() { _onFullscreenChanged() {
const parent = (this.getFullscreenElement() || document.body || null); const parent = (this._getFullscreenElement() || document.body || null);
if (parent !== null && this.container.parentNode !== parent) { if (parent !== null && this.container.parentNode !== parent) {
parent.appendChild(this.container); parent.appendChild(this.container);
} }
} }
static getPositionForHorizontalText(elementRect, width, height, maxWidth, maxHeight, optionsGeneral) { static _getPositionForHorizontalText(elementRect, width, height, maxWidth, maxHeight, optionsGeneral) {
let x = elementRect.left + optionsGeneral.popupHorizontalOffset; let x = elementRect.left + optionsGeneral.popupHorizontalOffset;
const overflowX = Math.max(x + width - maxWidth, 0); const overflowX = Math.max(x + width - maxWidth, 0);
if (overflowX > 0) { if (overflowX > 0) {
@ -311,7 +313,7 @@ class Popup {
const preferBelow = (optionsGeneral.popupHorizontalTextPosition === 'below'); const preferBelow = (optionsGeneral.popupHorizontalTextPosition === 'below');
const verticalOffset = optionsGeneral.popupVerticalOffset; const verticalOffset = optionsGeneral.popupVerticalOffset;
const [y, h, below] = Popup.limitGeometry( const [y, h, below] = Popup._limitGeometry(
elementRect.top - verticalOffset, elementRect.top - verticalOffset,
elementRect.bottom + verticalOffset, elementRect.bottom + verticalOffset,
height, height,
@ -322,19 +324,19 @@ class Popup {
return [x, y, width, h, below]; return [x, y, width, h, below];
} }
static getPositionForVerticalText(elementRect, width, height, maxWidth, maxHeight, optionsGeneral, writingMode) { static _getPositionForVerticalText(elementRect, width, height, maxWidth, maxHeight, optionsGeneral, writingMode) {
const preferRight = Popup.isVerticalTextPopupOnRight(optionsGeneral.popupVerticalTextPosition, writingMode); const preferRight = Popup._isVerticalTextPopupOnRight(optionsGeneral.popupVerticalTextPosition, writingMode);
const horizontalOffset = optionsGeneral.popupHorizontalOffset2; const horizontalOffset = optionsGeneral.popupHorizontalOffset2;
const verticalOffset = optionsGeneral.popupVerticalOffset2; const verticalOffset = optionsGeneral.popupVerticalOffset2;
const [x, w] = Popup.limitGeometry( const [x, w] = Popup._limitGeometry(
elementRect.left - horizontalOffset, elementRect.left - horizontalOffset,
elementRect.right + horizontalOffset, elementRect.right + horizontalOffset,
width, width,
maxWidth, maxWidth,
preferRight preferRight
); );
const [y, h, below] = Popup.limitGeometry( const [y, h, below] = Popup._limitGeometry(
elementRect.bottom - verticalOffset, elementRect.bottom - verticalOffset,
elementRect.top + verticalOffset, elementRect.top + verticalOffset,
height, height,
@ -344,12 +346,12 @@ class Popup {
return [x, y, w, h, below]; return [x, y, w, h, below];
} }
static isVerticalTextPopupOnRight(positionPreference, writingMode) { static _isVerticalTextPopupOnRight(positionPreference, writingMode) {
switch (positionPreference) { switch (positionPreference) {
case 'before': case 'before':
return !Popup.isWritingModeLeftToRight(writingMode); return !Popup._isWritingModeLeftToRight(writingMode);
case 'after': case 'after':
return Popup.isWritingModeLeftToRight(writingMode); return Popup._isWritingModeLeftToRight(writingMode);
case 'left': case 'left':
return false; return false;
case 'right': case 'right':
@ -357,7 +359,7 @@ class Popup {
} }
} }
static isWritingModeLeftToRight(writingMode) { static _isWritingModeLeftToRight(writingMode) {
switch (writingMode) { switch (writingMode) {
case 'vertical-lr': case 'vertical-lr':
case 'sideways-lr': case 'sideways-lr':
@ -367,7 +369,7 @@ class Popup {
} }
} }
static limitGeometry(positionBefore, positionAfter, size, limit, preferAfter) { static _limitGeometry(positionBefore, positionAfter, size, limit, preferAfter) {
let after = preferAfter; let after = preferAfter;
let position = 0; let position = 0;
const overflowBefore = Math.max(0, size - positionBefore); const overflowBefore = Math.max(0, size - positionBefore);
@ -389,7 +391,7 @@ class Popup {
return [position, size, after]; return [position, size, after];
} }
static addColor(target, color) { static _addColor(target, color) {
if (color === null) { return; } if (color === null) { return; }
const a = color[3]; const a = color[3];
@ -401,7 +403,7 @@ class Popup {
} }
} }
static getColorInfo(cssColor) { static _getColorInfo(cssColor) {
const m = /^\s*rgba?\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*(?:,\s*([\d.]+)\s*)?\)\s*$/.exec(cssColor); const m = /^\s*rgba?\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*(?:,\s*([\d.]+)\s*)?\)\s*$/.exec(cssColor);
if (m === null) { return null; } if (m === null) { return null; }
@ -414,7 +416,7 @@ class Popup {
]; ];
} }
static isOnExtensionPage() { static _isOnExtensionPage() {
try { try {
const url = chrome.runtime.getURL('/'); const url = chrome.runtime.getURL('/');
return window.location.href.substring(0, url.length) === url; return window.location.href.substring(0, url.length) === url;