aboutsummaryrefslogtreecommitdiff
path: root/ext/js/app
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2023-12-29 00:02:14 -0500
committerGitHub <noreply@github.com>2023-12-29 05:02:14 +0000
commit8b68504b3b95d0647b4305a43d7b326b801e1936 (patch)
tree106cfa2eb67bb5630c40dc63a4b8d9b2e1d8fa6d /ext/js/app
parent6a072dfdacf26d309bf8cd570c05f4d4b57c9af2 (diff)
Display API safety (#479)
* Remove unused * Add TODOs * Rename * Initial setup * More updates * Simplify naming * Set up window API * Remove type * Move type * Update type
Diffstat (limited to 'ext/js/app')
-rw-r--r--ext/js/app/popup-proxy.js2
-rw-r--r--ext/js/app/popup-window.js9
-rw-r--r--ext/js/app/popup.js20
3 files changed, 18 insertions, 13 deletions
diff --git a/ext/js/app/popup-proxy.js b/ext/js/app/popup-proxy.js
index d141d35b..2821d774 100644
--- a/ext/js/app/popup-proxy.js
+++ b/ext/js/app/popup-proxy.js
@@ -297,6 +297,7 @@ export class PopupProxy extends EventDispatcher {
// Private
+ // TODO : Type safety
/**
* @template {import('core').SerializableObject} TParams
* @template [TReturn=unknown]
@@ -308,6 +309,7 @@ export class PopupProxy extends EventDispatcher {
return yomitan.crossFrame.invoke(this._frameId, action, params);
}
+ // TODO : Type safety
/**
* @template {import('core').SerializableObject} TParams
* @template [TReturn=unknown]
diff --git a/ext/js/app/popup-window.js b/ext/js/app/popup-window.js
index 0b083d80..801afb3f 100644
--- a/ext/js/app/popup-window.js
+++ b/ext/js/app/popup-window.js
@@ -126,7 +126,7 @@ export class PopupWindow extends EventDispatcher {
* @returns {Promise<void>}
*/
async setOptionsContext(optionsContext) {
- await this._invoke(false, 'Display.setOptionsContext', {id: this._id, optionsContext});
+ await this._invoke(false, 'displaySetOptionsContext', {id: this._id, optionsContext});
}
/**
@@ -183,7 +183,7 @@ export class PopupWindow extends EventDispatcher {
*/
async showContent(_details, displayDetails) {
if (displayDetails === null) { return; }
- await this._invoke(true, 'Display.setContent', {id: this._id, details: displayDetails});
+ await this._invoke(true, 'displaySetContent', {id: this._id, details: displayDetails});
}
/**
@@ -192,7 +192,7 @@ export class PopupWindow extends EventDispatcher {
* @returns {Promise<void>}
*/
async setCustomCss(css) {
- await this._invoke(false, 'Display.setCustomCss', {id: this._id, css});
+ await this._invoke(false, 'displaySetCustomCss', {id: this._id, css});
}
/**
@@ -200,7 +200,7 @@ export class PopupWindow extends EventDispatcher {
* @returns {Promise<void>}
*/
async clearAutoPlayTimer() {
- await this._invoke(false, 'Display.clearAutoPlayTimer', {id: this._id});
+ await this._invoke(false, 'displayAudioClearAutoPlayTimer', {id: this._id});
}
/**
@@ -266,6 +266,7 @@ export class PopupWindow extends EventDispatcher {
// Private
+ // TODO : Type safety
/**
* @template {import('core').SerializableObject} TParams
* @template [TReturn=unknown]
diff --git a/ext/js/app/popup.js b/ext/js/app/popup.js
index 4f2368d4..a8cdf1a6 100644
--- a/ext/js/app/popup.js
+++ b/ext/js/app/popup.js
@@ -215,7 +215,7 @@ export class Popup extends EventDispatcher {
async setOptionsContext(optionsContext) {
await this._setOptionsContext(optionsContext);
if (this._frameConnected) {
- await this._invokeSafe('Display.setOptionsContext', {optionsContext});
+ await this._invokeSafe('displaySetOptionsContext', {optionsContext});
}
}
@@ -299,7 +299,7 @@ export class Popup extends EventDispatcher {
await this._show(sourceRects, writingMode);
if (displayDetails !== null) {
- this._invokeSafe('Display.setContent', {details: displayDetails});
+ this._invokeSafe('displaySetContent', {details: displayDetails});
}
}
@@ -308,7 +308,7 @@ export class Popup extends EventDispatcher {
* @param {string} css The CSS rules.
*/
async setCustomCss(css) {
- await this._invokeSafe('Display.setCustomCss', {css});
+ await this._invokeSafe('displaySetCustomCss', {css});
}
/**
@@ -316,7 +316,7 @@ export class Popup extends EventDispatcher {
*/
async clearAutoPlayTimer() {
if (this._frameConnected) {
- await this._invokeSafe('Display.clearAutoPlayTimer', {});
+ await this._invokeSafe('displayAudioClearAutoPlayTimer', {});
}
}
@@ -327,7 +327,7 @@ export class Popup extends EventDispatcher {
async setContentScale(scale) {
this._contentScale = scale;
this._frame.style.fontSize = `${scale}px`;
- await this._invokeSafe('Display.setContentScale', {scale});
+ await this._invokeSafe('displaySetContentScale', {scale});
}
/**
@@ -480,7 +480,7 @@ export class Popup extends EventDispatcher {
this._frameConnected = true;
// Configure
- /** @type {import('display').ConfigureMessageDetails} */
+ /** @type {import('display').DirectApiParams<'displayConfigure'>} */
const configureParams = {
depth: this._depth,
parentPopupId: this._id,
@@ -489,7 +489,7 @@ export class Popup extends EventDispatcher {
scale: this._contentScale,
optionsContext: this._optionsContext
};
- await this._invokeSafe('Display.configure', configureParams);
+ await this._invokeSafe('displayConfigure', configureParams);
}
/**
@@ -657,7 +657,7 @@ export class Popup extends EventDispatcher {
if (this._visibleValue === value) { return; }
this._visibleValue = value;
this._frame.style.setProperty('visibility', value ? 'visible' : 'hidden', 'important');
- this._invokeSafe('Display.visibilityChanged', {value});
+ this._invokeSafe('displayVisibilityChanged', {value});
}
/**
@@ -679,6 +679,7 @@ export class Popup extends EventDispatcher {
}
}
+ // TODO : Type safety
/**
* @template {import('core').SerializableObject} TParams
* @template [TReturn=unknown]
@@ -696,6 +697,7 @@ export class Popup extends EventDispatcher {
return await yomitan.crossFrame.invoke(this._frameClient.frameId, 'popupMessage', message);
}
+ // TODO : Type safety
/**
* @template {import('core').SerializableObject} TParams
* @template [TReturn=unknown]
@@ -728,7 +730,7 @@ export class Popup extends EventDispatcher {
* @returns {void}
*/
_onExtensionUnloaded() {
- this._invokeWindow('Display.extensionUnloaded');
+ this._invokeWindow('displayExtensionUnloaded');
}
/**