diff --git a/src/browser/base/zen-components/ZenRices.mjs b/src/browser/base/zen-components/ZenRices.mjs index cbfbbae31..8fa2132fa 100644 --- a/src/browser/base/zen-components/ZenRices.mjs +++ b/src/browser/base/zen-components/ZenRices.mjs @@ -417,7 +417,9 @@ frame.call(this); } - openRicePage({ id, name, author }) { + openRicePage({ name, id, author }) { + console.log("Opening rice page: ", name, id, author); + gBrowser.removeTab(gBrowser.selectedTab); } } diff --git a/src/browser/base/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs b/src/browser/base/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs index 8fb5a59b8..cfbe01c6b 100644 --- a/src/browser/base/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs +++ b/src/browser/base/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs @@ -18,8 +18,8 @@ export class ZenThemeMarketplaceChild extends JSWindowActorChild { verifier.setAttribute('content', 'verified'); } const possibleRicePage = this.collectRiceMetadata(); - if (possibleRicePage) { - this.sendAsyncMessage('ZenThemeMarketplace:RicePage', { data: possibleRicePage }); + if (possibleRicePage?.id) { + this.sendAsyncMessage('ZenThemeMarketplace:RicePage', possibleRicePage); return; } this.initiateThemeMarketplace(); @@ -27,11 +27,11 @@ export class ZenThemeMarketplaceChild extends JSWindowActorChild { } collectRiceMetadata() { - const meta = this.contentWindow.document.querySelector('meta[name="rize-metadata"]'); + const meta = this.contentWindow.document.querySelector('meta[name="zen-rice-data"]'); if (meta) { return { id: meta.getAttribute('data-id'), - name: meta.getAttribute('data-title'), + name: meta.getAttribute('data-name'), author: meta.getAttribute('data-author'), } } diff --git a/src/browser/base/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs b/src/browser/base/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs index ea54d52ad..67ed536f1 100644 --- a/src/browser/base/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs +++ b/src/browser/base/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs @@ -42,8 +42,7 @@ export class ZenThemeMarketplaceParent extends JSWindowActorParent { } openRicePage(window, data) { - console.info(this.browsingContext); - window.gZenThemeMarketplaceManager.openRicePage(data); + window.gZenThemePicker.riceManager.openRicePage(data); } compareversion(version1, version2) {