From c05abd76b228276d5acc95eac397bf5ee7c376db Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Fri, 16 Aug 2024 22:23:40 +0200 Subject: [PATCH] refactor: Update ZenSidebarManager to use updated default mobile user agent --- src/ZenSidebarManager.mjs | 2 +- src/actors/ZenThemeMarketplaceChild.sys.mjs | 37 +++++--------------- src/actors/ZenThemeMarketplaceParent.sys.mjs | 2 +- 3 files changed, 11 insertions(+), 30 deletions(-) diff --git a/src/ZenSidebarManager.mjs b/src/ZenSidebarManager.mjs index db75209..b519f7d 100644 --- a/src/ZenSidebarManager.mjs +++ b/src/ZenSidebarManager.mjs @@ -73,7 +73,7 @@ var gZenBrowserManagerSidebar = { const parent = sidebar.parentElement; // relative to avoid the top margin // 20px is the padding - let parentRelativeHeight = parent.getBoundingClientRect().height - parent.getBoundingClientRect().top + 20; + let parentRelativeHeight = parent.getBoundingClientRect().height - parent.getBoundingClientRect().top + 30; let minHeight = parseInt(computedStyle.getPropertyValue("min-height").replace("px", "")); if (!this._isDragging) { // Prevent multiple resizes this._isDragging = true; diff --git a/src/actors/ZenThemeMarketplaceChild.sys.mjs b/src/actors/ZenThemeMarketplaceChild.sys.mjs index d120df1..747f015 100644 --- a/src/actors/ZenThemeMarketplaceChild.sys.mjs +++ b/src/actors/ZenThemeMarketplaceChild.sys.mjs @@ -1,5 +1,4 @@ -const kZenThemesPreference = "zen.themes.data"; export class ZenThemeMarketplaceChild extends JSWindowActorChild { constructor() { super(); @@ -17,41 +16,23 @@ export class ZenThemeMarketplaceChild extends JSWindowActorChild { initiateThemeMarketplace() { this.contentWindow.setTimeout(() => { this.addIntallButtons(); - }, 1000); + }, 0); } async addIntallButtons() { - const actionButtons = this.contentWindow.document.querySelectorAll(".install-theme"); - const errorMessages = this.contentWindow.document.querySelectorAll(".install-theme-error"); - if (actionButtons.length !== 0) { + const actionButton = this.contentWindow.document.getElementById("install-theme"); + const errorMessage = this.contentWindow.document.getElementById("install-theme-error"); + if (actionButton) { console.info("ZenThemeMarketplaceChild: Initiating theme marketplace"); } - for (let error of errorMessages) { - error.remove(); - } - - for (let button of actionButtons) { - button.classList.remove("hidden"); - button.addEventListener("click", this.installTheme.bind(this)); - } - } - - get themes() { - if (!this._themes) { - this._themes = JSON.parse(Services.prefs.getStringPref(kZenThemesPreference, "{}")); - } - return this._themes; - } - - set themes(themes) { - this._themes = themes; - this.sendAsyncMessage("ZenThemeMarketplace:UpdateThemes", { themes }); + errorMessage.classList.add("hidden"); + actionButton.classList.remove("hidden"); + actionButton.addEventListener("click", this.installTheme.bind(this)); } addTheme(theme) { - this.themes[theme.id] = theme; - this.themes = this.themes; + this.sendAsyncMessage("ZenThemeMarketplace:InstallTheme", { theme }); } async getThemeInfo(themeId) { @@ -84,4 +65,4 @@ export class ZenThemeMarketplaceChild extends JSWindowActorChild { } this.addTheme(theme); } -}; +}; \ No newline at end of file diff --git a/src/actors/ZenThemeMarketplaceParent.sys.mjs b/src/actors/ZenThemeMarketplaceParent.sys.mjs index 6ebe23d..d9421bd 100644 --- a/src/actors/ZenThemeMarketplaceParent.sys.mjs +++ b/src/actors/ZenThemeMarketplaceParent.sys.mjs @@ -88,4 +88,4 @@ export class ZenThemeMarketplaceParent extends JSWindowActorParent { } } } -}; +}; \ No newline at end of file