From eeff203318bba500625f30c1532ae5bdd40399be Mon Sep 17 00:00:00 2001 From: Moonchild Date: Tue, 23 Jan 2024 10:22:20 +0100 Subject: [PATCH] No issue - Remove leftover beta-only dev edition promo in devtools. --- .../dev-edition-promo/dev-edition-logo.png | Bin 6764 -> 0 bytes .../dev-edition-promo/dev-edition-promo.css | 94 ------------------ .../dev-edition-promo/dev-edition-promo.xul | 36 ------- devtools/client/framework/toolbox.js | 16 --- devtools/client/jar.mn | 3 - .../responsivedesign/responsivedesign.jsm | 8 -- devtools/client/shared/doorhanger.js | 31 +----- devtools/client/webconsole/hudservice.js | 6 -- 8 files changed, 2 insertions(+), 192 deletions(-) delete mode 100644 devtools/client/framework/dev-edition-promo/dev-edition-logo.png delete mode 100644 devtools/client/framework/dev-edition-promo/dev-edition-promo.css delete mode 100644 devtools/client/framework/dev-edition-promo/dev-edition-promo.xul diff --git a/devtools/client/framework/dev-edition-promo/dev-edition-logo.png b/devtools/client/framework/dev-edition-promo/dev-edition-logo.png deleted file mode 100644 index 4b90768d2d172703a185da55bf3ab9e619ca6a63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6764 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 O0000 - - - %toolboxDTD; -]> - - - - - - - - -

Using Developer Tools in your browser?

-

Download Firefox Developer Edition, our first browser made just for you.

- - - - - - - - - - diff --git a/devtools/client/framework/toolbox.js b/devtools/client/framework/toolbox.js index cde7de0e41..4ec8647eb5 100644 --- a/devtools/client/framework/toolbox.js +++ b/devtools/client/framework/toolbox.js @@ -117,7 +117,6 @@ function Toolbox(target, selectedTool, hostType, contentWindow, frameId) { this._saveSplitConsoleHeight = this._saveSplitConsoleHeight.bind(this); this._onFocus = this._onFocus.bind(this); this._onBrowserMessage = this._onBrowserMessage.bind(this); - this._showDevEditionPromo = this._showDevEditionPromo.bind(this); this._updateTextBoxMenuItems = this._updateTextBoxMenuItems.bind(this); this._onBottomHostMinimized = this._onBottomHostMinimized.bind(this); this._onBottomHostMaximized = this._onBottomHostMaximized.bind(this); @@ -149,8 +148,6 @@ function Toolbox(target, selectedTool, hostType, contentWindow, frameId) { this.on("host-changed", this._refreshHostTitle); this.on("select", this._refreshHostTitle); - this.on("ready", this._showDevEditionPromo); - gDevTools.on("tool-registered", this._toolRegistered); gDevTools.on("tool-unregistered", this._toolUnregistered); @@ -2095,7 +2092,6 @@ Toolbox.prototype = { this._target.off("frame-update", this._updateFrames); this.off("select", this._refreshHostTitle); this.off("host-changed", this._refreshHostTitle); - this.off("ready", this._showDevEditionPromo); gDevTools.off("tool-registered", this._toolRegistered); gDevTools.off("tool-unregistered", this._toolUnregistered); @@ -2251,18 +2247,6 @@ Toolbox.prototype = { this.emit("highlighter-hide"); }, - /** - * For displaying the promotional Doorhanger on first opening of - * the developer tools, promoting the Developer Edition. - */ - _showDevEditionPromo: function () { - // Do not display in browser toolbox - if (this.target.chrome) { - return; - } - showDoorhanger({ window: this.win, type: "deveditionpromo" }); - }, - /** * Enable / disable necessary textbox menu items using globalOverlay.js. */ diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn index 95965873f0..a6334057e3 100644 --- a/devtools/client/jar.mn +++ b/devtools/client/jar.mn @@ -111,9 +111,6 @@ devtools.jar: content/framework/options-panel.css (framework/options-panel.css) content/framework/toolbox-process-window.xul (framework/toolbox-process-window.xul) * content/framework/toolbox-process-window.js (framework/toolbox-process-window.js) - content/framework/dev-edition-promo/dev-edition-promo.xul (framework/dev-edition-promo/dev-edition-promo.xul) -* content/framework/dev-edition-promo/dev-edition-promo.css (framework/dev-edition-promo/dev-edition-promo.css) - content/framework/dev-edition-promo/dev-edition-logo.png (framework/dev-edition-promo/dev-edition-logo.png) content/inspector/inspector.xhtml (inspector/inspector.xhtml) content/framework/connect/connect.xhtml (framework/connect/connect.xhtml) content/framework/connect/connect.css (framework/connect/connect.css) diff --git a/devtools/client/responsivedesign/responsivedesign.jsm b/devtools/client/responsivedesign/responsivedesign.jsm index fbedbc4469..116ee3fb8e 100644 --- a/devtools/client/responsivedesign/responsivedesign.jsm +++ b/devtools/client/responsivedesign/responsivedesign.jsm @@ -255,14 +255,6 @@ ResponsiveUI.prototype = { yield this.connectToServer(); this.userAgentInput.hidden = false; - // Hook to display promotional Developer Edition doorhanger. - // Only displayed once. - showDoorhanger({ - window: this.mainWindow, - type: "deveditionpromo", - anchor: this.chromeDoc.querySelector("#content") - }); - // Notify that responsive mode is on. this._telemetry.toolOpened("responsive"); ResponsiveUIManager.emit("on", { tab: this.tab }); diff --git a/devtools/client/shared/doorhanger.js b/devtools/client/shared/doorhanger.js index fc27679660..4c6d6f8cb7 100644 --- a/devtools/client/shared/doorhanger.js +++ b/devtools/client/shared/doorhanger.js @@ -12,40 +12,13 @@ const defer = require("devtools/shared/defer"); const { getMostRecentBrowserWindow } = require("sdk/window/utils"); const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; -const DEV_EDITION_PROMO_URL = "chrome://devtools/content/framework/dev-edition-promo/dev-edition-promo.xul"; -const DEV_EDITION_PROMO_ENABLED_PREF = "devtools.devedition.promo.enabled"; -const DEV_EDITION_PROMO_SHOWN_PREF = "devtools.devedition.promo.shown"; -const DEV_EDITION_PROMO_URL_PREF = "devtools.devedition.promo.url"; const LOCALE = Cc["@mozilla.org/chrome/chrome-registry;1"] .getService(Ci.nsIXULChromeRegistry) .getSelectedLocale("global"); -/** - * Only show Dev Edition promo if it's enabled (beta channel), - * if it has not been shown before, and it's a locale build - * for `en-US` - */ -function shouldDevEditionPromoShow() { - return Services.prefs.getBoolPref(DEV_EDITION_PROMO_ENABLED_PREF) && - !Services.prefs.getBoolPref(DEV_EDITION_PROMO_SHOWN_PREF) && - LOCALE === "en-US"; -} - var TYPES = { - // The Developer Edition promo doorhanger, called by - // opening the toolbox, browser console, WebIDE, or responsive design mode - // in Beta releases. Only displayed once per profile. - deveditionpromo: { - predicate: shouldDevEditionPromoShow, - success: () => { - return Services.prefs.setBoolPref(DEV_EDITION_PROMO_SHOWN_PREF, true); - }, - action: () => { - let url = Services.prefs.getCharPref(DEV_EDITION_PROMO_URL_PREF); - getGBrowser().selectedTab = getGBrowser().addTab(url); - }, - url: DEV_EDITION_PROMO_URL - } + // We don't support any doorhanger types at the moment. + // This is vestigial from the FF dev edition promo. }; var panelAttrs = { diff --git a/devtools/client/webconsole/hudservice.js b/devtools/client/webconsole/hudservice.js index 3023b7bb3b..fbb58ce743 100644 --- a/devtools/client/webconsole/hudservice.js +++ b/devtools/client/webconsole/hudservice.js @@ -682,12 +682,6 @@ BrowserConsole.prototype = extend(WebConsole.prototype, { this._telemetry.toolOpened("browserconsole"); - // Create an onFocus handler just to display the dev edition promo. - // This is to prevent race conditions in some environments. - // Hook to display promotional Developer Edition doorhanger. Only displayed once. - let onFocus = () => showDoorhanger({ window, type: "deveditionpromo" }); - window.addEventListener("focus", onFocus); - this._bc_init = this.$init(); return this._bc_init; },