From 7e9f7e2616973418cc50f7706bd8f644cb9d5559 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sun, 18 Feb 2024 07:58:59 -0500 Subject: 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 --- ext/js/display/search-main.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'ext/js/display/search-main.js') diff --git a/ext/js/display/search-main.js b/ext/js/display/search-main.js index 5c6a31ca..fd90ee0e 100644 --- a/ext/js/display/search-main.js +++ b/ext/js/display/search-main.js @@ -36,12 +36,10 @@ await Application.main(async (application) => { const searchActionPopupController = new SearchActionPopupController(searchPersistentStateController); searchActionPopupController.prepare(); - const {tabId, frameId} = await application.api.frameInformationGet(); - const hotkeyHandler = new HotkeyHandler(); hotkeyHandler.prepare(application.crossFrame); - const display = new Display(application, tabId, frameId, 'search', documentFocusController, hotkeyHandler); + const display = new Display(application, 'search', documentFocusController, hotkeyHandler); await display.prepare(); const displayAudio = new DisplayAudio(display); @@ -50,7 +48,7 @@ await Application.main(async (application) => { const displayAnki = new DisplayAnki(display, displayAudio); displayAnki.prepare(); - const searchDisplayController = new SearchDisplayController(tabId, frameId, display, displayAudio, searchPersistentStateController); + const searchDisplayController = new SearchDisplayController(display, displayAudio, searchPersistentStateController); await searchDisplayController.prepare(); display.initializeState(); -- cgit v1.2.3