Bug 1528296 - remove deprecation message r=vporof
authoryulia <ystartsev@mozilla.com>
Wed, 13 Mar 2019 16:52:41 +0000
changeset 521745 be6699d71bec4922968a54cd751b90ada61a365a
parent 521744 f87bb852e0742b86cf2686bf82921f6d57ab073f
child 521746 4922ae983a563320bff83e1ba9d9d81365c4cc41
push id10867
push userdvarga@mozilla.com
push dateThu, 14 Mar 2019 15:20:45 +0000
treeherdermozilla-beta@abad13547875 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvporof
bugs1528296
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1528296 - remove deprecation message r=vporof Differential Revision: https://phabricator.services.mozilla.com/D22574
devtools/client/definitions.js
devtools/client/framework/toolbox-options.js
devtools/client/framework/toolbox.js
devtools/client/locales/en-US/toolbox.properties
devtools/client/themes/toolbox.css
--- a/devtools/client/definitions.js
+++ b/devtools/client/definitions.js
@@ -31,19 +31,16 @@ loader.lazyRequireGetter(this, "Responsi
 loader.lazyImporter(this, "ScratchpadManager", "resource://devtools/client/scratchpad/scratchpad-manager.jsm");
 
 const {MultiLocalizationHelper} = require("devtools/shared/l10n");
 const L10N = new MultiLocalizationHelper(
   "devtools/client/locales/startup.properties",
   "devtools/startup/locales/key-shortcuts.properties"
 );
 
-// URL to direct people to the deprecated tools panel
-const DEPRECATION_URL = "https://developer.mozilla.org/en-US/docs/Tools/Deprecated_tools";
-
 var Tools = {};
 exports.Tools = Tools;
 
 // Definitions
 Tools.options = {
   id: "options",
   ordinal: 0,
   url: "chrome://devtools/content/framework/toolbox-options.xhtml",
--- a/devtools/client/framework/toolbox-options.js
+++ b/devtools/client/framework/toolbox-options.js
@@ -244,29 +244,16 @@ OptionsPanel.prototype = {
       }
 
       checkboxInput.addEventListener("change",
         onCheckboxClick.bind(checkboxInput, this.telemetry, tool));
 
       checkboxLabel.appendChild(checkboxInput);
       checkboxLabel.appendChild(checkboxSpanLabel);
 
-      // TODO: remove in Firefox 68, with bug #1528296
-      if (tool.deprecated) {
-        const deprecationURL = this.panelDoc.createElement("a");
-        deprecationURL.title = deprecationURL.href = tool.deprecationURL;
-        deprecationURL.textContent = L10N.getFormatStr("options.deprecationNotice");
-        deprecationURL.target = "_blank";
-
-        const checkboxSpanDeprecated = this.panelDoc.createElement("span");
-        checkboxSpanDeprecated.className = "deprecation-notice";
-        checkboxLabel.appendChild(checkboxSpanDeprecated);
-        checkboxSpanDeprecated.appendChild(deprecationURL);
-      }
-
       return checkboxLabel;
     };
 
     // Clean up any existent default tools content.
     for (const label of defaultToolsBox.querySelectorAll("label")) {
       label.remove();
     }
 
--- a/devtools/client/framework/toolbox.js
+++ b/devtools/client/framework/toolbox.js
@@ -1811,29 +1811,16 @@ Toolbox.prototype = {
 
       // If no parent yet, append the frame into default location.
       if (!iframe.parentNode) {
         const vbox = this.doc.getElementById("toolbox-panel-" + id);
         vbox.appendChild(iframe);
         vbox.visibility = "visible";
       }
 
-      // TODO: remove in Firefox 68, with bug #1528296
-      if (definition.deprecated) {
-        const deprecationURL = this.doc.createXULElement("label");
-        deprecationURL.textContent = L10N.getFormatStr("options.deprecationNotice");
-        deprecationURL.setAttribute("href", definition.deprecationURL);
-        deprecationURL.setAttribute("class", "text-link");
-
-        const deprecationNotice = this.doc.createXULElement("span");
-        deprecationNotice.className = "toolbox-panel_deprecation-notice";
-        deprecationNotice.appendChild(deprecationURL);
-        iframe.parentNode.prepend(deprecationNotice);
-      }
-
       const onLoad = async () => {
         if (id === "inspector") {
           await this._initInspector;
 
           // Stop loading the inspector if the toolbox is already being destroyed. This
           // can happen in unit tests where the tests are rapidly opening and closing the
           // toolbox and we encounter the scenario where the toolbox is closing as
           // the inspector is still loading.
--- a/devtools/client/locales/en-US/toolbox.properties
+++ b/devtools/client/locales/en-US/toolbox.properties
@@ -22,21 +22,16 @@ toolbox.defaultTitle=Developer Tools
 toolbox.label=Developer Tools
 
 # LOCALIZATION NOTE (options.toolNotSupportedMarker): This is the template
 # used to add a * marker to the label for the Options Panel tool checkbox for the
 # tool which is not supported for the current toolbox target.
 # The name of the tool: %1$S.
 options.toolNotSupportedMarker=%1$S *
 
-# LOCALIZATION NOTE (options.deprecationNotice): This is the template
-# is used to generate a deprecation notice for a panel.
-# This entire text is treated as a link to an MDN page.
-options.deprecationNotice=Deprecated. Learn Moreā€¦
-
 # LOCALIZATION NOTE (scratchpad.keycode)
 # Used for opening scratchpad from the detached toolbox window
 # Needs to match scratchpad.keycode from browser.dtd
 scratchpad.keycode=VK_F4
 
 # LOCALIZATION NOTE (toolbox.pickButton.tooltip)
 # This is the tooltip of the element picker button in the toolbox toolbar.
 # %S is the keyboard shortcut that toggles the element picker.
--- a/devtools/client/themes/toolbox.css
+++ b/devtools/client/themes/toolbox.css
@@ -359,38 +359,16 @@
   -moz-box-flex: 1;
   visibility: collapse;
 }
 
 .toolbox-panel[selected] {
   visibility: visible;
 }
 
-.toolbox-panel_deprecation-notice::before {
-  background-image: url("chrome://global/skin/icons/warning.svg");
-  content: '';
-  display: inline-block;
-  flex-shrink: 0;
-  height: 15px;
-  margin-inline-end: 5px;
-  width: 15px;
-}
-
-.toolbox-panel_deprecation-notice {
-  align-items: center;
-  background-color: hsl(54, 100%, 92%);
-  box-shadow: 0 0 0px 4px hsl(54, 100%, 92%);
-  display: flex;
-  padding: 4px;
-}
-
-.toolbox-panel_deprecation-notice label {
-  color: var(--yellow-80);
-}
-
 /**
  * When panels are collapsed or hidden, making sure that they are also
  * inaccessible by keyboard. This is not the case by default because the are
  * predominantly hidden using visibility: collapse; style or collapsed
  * attribute.
  */
 .toolbox-panel *,
 #toolbox-panel-webconsole[collapsed] * {