aboutsummaryrefslogtreecommitdiff
path: root/ext/js/pages
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2024-02-18 07:58:59 -0500
committerGitHub <noreply@github.com>2024-02-18 12:58:59 +0000
commit7e9f7e2616973418cc50f7706bd8f644cb9d5559 (patch)
tree8f8bec7a777a2df33a0a26ef53022c50d2327ef8 /ext/js/pages
parent4aaa9f15d97668203741c1731f15e710ae8b8294 (diff)
Application data refactor (#699)
* Pass tabId and frameId to Application * Remove casts * Remove redundant frameInformationGet calls * Expose tabId and frameId * Remove unsed * Simplify * Update FrameAncestryHandler to not need a direct frameId * Remove frameId from FrameOffsetForwarder * Remove frameId from PopupFactory * Remove frameId from Frontend * Remove frameId from PopupPreviewFrame * Fix PopupFactory and Frontend constructor * Remove frameId from Display * Remove frameId from SearchDisplayController * Restore if check
Diffstat (limited to 'ext/js/pages')
-rw-r--r--ext/js/pages/settings/popup-preview-frame-main.js12
-rw-r--r--ext/js/pages/settings/popup-preview-frame.js10
2 files changed, 3 insertions, 19 deletions
diff --git a/ext/js/pages/settings/popup-preview-frame-main.js b/ext/js/pages/settings/popup-preview-frame-main.js
index cffbf01b..c6c694cd 100644
--- a/ext/js/pages/settings/popup-preview-frame-main.js
+++ b/ext/js/pages/settings/popup-preview-frame-main.js
@@ -22,21 +22,13 @@ import {HotkeyHandler} from '../../input/hotkey-handler.js';
import {PopupPreviewFrame} from './popup-preview-frame.js';
await Application.main(async (application) => {
- const {tabId, frameId} = await application.api.frameInformationGet();
- if (typeof tabId === 'undefined') {
- throw new Error('Failed to get tabId');
- }
- if (typeof frameId === 'undefined') {
- throw new Error('Failed to get frameId');
- }
-
const hotkeyHandler = new HotkeyHandler();
hotkeyHandler.prepare(application.crossFrame);
- const popupFactory = new PopupFactory(application, frameId);
+ const popupFactory = new PopupFactory(application);
popupFactory.prepare();
- const preview = new PopupPreviewFrame(application, tabId, frameId, popupFactory, hotkeyHandler);
+ const preview = new PopupPreviewFrame(application, popupFactory, hotkeyHandler);
await preview.prepare();
document.documentElement.dataset.loaded = 'true';
diff --git a/ext/js/pages/settings/popup-preview-frame.js b/ext/js/pages/settings/popup-preview-frame.js
index 1ad4859b..2898eaa2 100644
--- a/ext/js/pages/settings/popup-preview-frame.js
+++ b/ext/js/pages/settings/popup-preview-frame.js
@@ -24,18 +24,12 @@ import {TextSourceRange} from '../../dom/text-source-range.js';
export class PopupPreviewFrame {
/**
* @param {import('../../application.js').Application} application
- * @param {number} tabId
- * @param {number} frameId
* @param {import('../../app/popup-factory.js').PopupFactory} popupFactory
* @param {import('../../input/hotkey-handler.js').HotkeyHandler} hotkeyHandler
*/
- constructor(application, tabId, frameId, popupFactory, hotkeyHandler) {
+ constructor(application, popupFactory, hotkeyHandler) {
/** @type {import('../../application.js').Application} */
this._application = application;
- /** @type {number} */
- this._tabId = tabId;
- /** @type {number} */
- this._frameId = frameId;
/** @type {import('../../app/popup-factory.js').PopupFactory} */
this._popupFactory = popupFactory;
/** @type {import('../../input/hotkey-handler.js').HotkeyHandler} */
@@ -94,8 +88,6 @@ export class PopupPreviewFrame {
// Overwrite frontend
this._frontend = new Frontend({
application: this._application,
- tabId: this._tabId,
- frameId: this._frameId,
popupFactory: this._popupFactory,
depth: 0,
parentPopupId: null,