- Test the pref to enable/disable the "Show MDN Docs" context menu option
-
-
-
-`;
-
-add_task(function* () {
- info("Ensure the pref is true to begin with");
- let initial = Services.prefs.getBoolPref(PREF_ENABLE_MDN_DOCS_TOOLTIP);
- if (initial != true) {
- yield setBooleanPref(PREF_ENABLE_MDN_DOCS_TOOLTIP, true);
- }
-
- yield addTab("data:text/html;charset=utf8," + encodeURIComponent(TEST_DOC));
-
- let {inspector, view} = yield openRuleView();
- yield selectNode("div", inspector);
- yield testMdnContextMenuItemVisibility(view, true);
-
- yield setBooleanPref(PREF_ENABLE_MDN_DOCS_TOOLTIP, false);
- yield testMdnContextMenuItemVisibility(view, false);
-
- info("Close the Inspector");
- let target = TargetFactory.forTab(gBrowser.selectedTab);
- yield gDevTools.closeToolbox(target);
-
- ({inspector, view} = yield openRuleView());
- yield selectNode("div", inspector);
- yield testMdnContextMenuItemVisibility(view, false);
-
- yield setBooleanPref(PREF_ENABLE_MDN_DOCS_TOOLTIP, true);
- yield testMdnContextMenuItemVisibility(view, true);
-
- info("Ensure the pref is reset to its initial value");
- let eventual = Services.prefs.getBoolPref(PREF_ENABLE_MDN_DOCS_TOOLTIP);
- if (eventual != initial) {
- yield setBooleanPref(PREF_ENABLE_MDN_DOCS_TOOLTIP, initial);
- }
-});
-
-/**
- * Set a boolean pref, and wait for the pref observer to
- * trigger, so that code listening for the pref change
- * has had a chance to update itself.
- *
- * @param pref {string} Name of the pref to change
- * @param state {boolean} Desired value of the pref.
- *
- * Note that if the pref already has the value in `state`,
- * then the prefObserver will not trigger. So you should only
- * call this function if you know the pref's current value is
- * not `state`.
- */
-function* setBooleanPref(pref, state) {
- let oncePrefChanged = defer();
- let prefObserver = new PrefObserver("devtools.");
- prefObserver.on(pref, oncePrefChanged.resolve);
-
- info("Set the pref " + pref + " to: " + state);
- Services.prefs.setBoolPref(pref, state);
-
- info("Wait for prefObserver to call back so the UI can update");
- yield oncePrefChanged.promise;
- prefObserver.off(pref, oncePrefChanged.resolve);
-}
-
-/**
- * Test whether the MDN tooltip context menu item is visible when it should be.
- *
- * @param view The rule view
- * @param shouldBeVisible {boolean} Whether we expect the context
- * menu item to be visible or not.
- */
-function* testMdnContextMenuItemVisibility(view, shouldBeVisible) {
- let message = shouldBeVisible ? "shown" : "hidden";
- info("Test that MDN context menu item is " + message);
-
- info("Set a CSS property name as popupNode");
- let root = rootElement(view);
- let node = root.querySelector("." + PROPERTY_NAME_CLASS).firstChild;
- let allMenuItems = openStyleContextMenuAndGetAllItems(view, node);
- let menuitemShowMdnDocs = allMenuItems.find(item => item.label ===
- STYLE_INSPECTOR_L10N.getStr("styleinspector.contextmenu.showMdnDocs"));
-
- let isVisible = menuitemShowMdnDocs.visible;
- is(isVisible, shouldBeVisible,
- "The MDN context menu item is " + message);
-}
-
-/**
- * Returns the root element for the rule view.
- */
-var rootElement = view => (view.element) ? view.element : view.styleDocument;
diff --git a/devtools/client/inspector/shared/style-inspector-menu.js b/devtools/client/inspector/shared/style-inspector-menu.js
index 7dcb609916..d6b9708e32 100644
--- a/devtools/client/inspector/shared/style-inspector-menu.js
+++ b/devtools/client/inspector/shared/style-inspector-menu.js
@@ -25,9 +25,6 @@ const STYLE_INSPECTOR_PROPERTIES = "devtools/shared/locales/styleinspector.prope
const {LocalizationHelper} = require("devtools/shared/l10n");
const STYLE_INSPECTOR_L10N = new LocalizationHelper(STYLE_INSPECTOR_PROPERTIES);
-const PREF_ENABLE_MDN_DOCS_TOOLTIP =
- "devtools.inspector.mdnDocsTooltip.enabled";
-
/**
* Style inspector context menu
*
@@ -56,7 +53,6 @@ function StyleInspectorMenu(view, options) {
this._onCopySelector = this._onCopySelector.bind(this);
this._onCopyUrl = this._onCopyUrl.bind(this);
this._onSelectAll = this._onSelectAll.bind(this);
- this._onShowMdnDocs = this._onShowMdnDocs.bind(this);
this._onToggleOrigSources = this._onToggleOrigSources.bind(this);
}
@@ -229,19 +225,6 @@ StyleInspectorMenu.prototype = {
});
menu.append(menuitemAddRule);
- // Show MDN Docs
- let mdnDocsAccessKey = "styleinspector.contextmenu.showMdnDocs.accessKey";
- let menuitemShowMdnDocs = new MenuItem({
- label: STYLE_INSPECTOR_L10N.getStr("styleinspector.contextmenu.showMdnDocs"),
- accesskey: STYLE_INSPECTOR_L10N.getStr(mdnDocsAccessKey),
- click: () => {
- this._onShowMdnDocs();
- },
- visible: (Services.prefs.getBoolPref(PREF_ENABLE_MDN_DOCS_TOOLTIP) &&
- this._isPropertyName()),
- });
- menu.append(menuitemShowMdnDocs);
-
// Show Original Sources
let sourcesAccessKey = "styleinspector.contextmenu.toggleOrigSources.accessKey";
let menuitemSources = new MenuItem({
@@ -407,16 +390,6 @@ StyleInspectorMenu.prototype = {
clipboardHelper.copyString(message);
}),
- /**
- * Show docs from MDN for a CSS property.
- */
- _onShowMdnDocs: function () {
- let cssPropertyName = this.styleDocument.popupNode.textContent;
- let anchor = this.styleDocument.popupNode.parentNode;
- let cssDocsTooltip = this.view.tooltips.cssDocs;
- cssDocsTooltip.show(anchor, cssPropertyName);
- },
-
/**
* Add a new rule to the current element.
*/
diff --git a/devtools/client/inspector/shared/tooltips-overlay.js b/devtools/client/inspector/shared/tooltips-overlay.js
index 1860587ddd..6718a52057 100644
--- a/devtools/client/inspector/shared/tooltips-overlay.js
+++ b/devtools/client/inspector/shared/tooltips-overlay.js
@@ -18,7 +18,6 @@ const {
} = require("devtools/client/inspector/shared/node-types");
const { getColor } = require("devtools/client/shared/theme");
const { getCssProperties } = require("devtools/shared/fronts/css-properties");
-const CssDocsTooltip = require("devtools/client/shared/widgets/tooltip/CssDocsTooltip");
const { HTMLTooltip } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
const {
getImageDimensions,
@@ -82,9 +81,6 @@ TooltipsOverlay.prototype = {
this.previewTooltip.startTogglingOnHover(this.view.element,
this._onPreviewTooltipTargetHover.bind(this));
- // MDN CSS help tooltip
- this.cssDocs = new CssDocsTooltip(toolbox.doc);
-
if (this.isRuleView) {
// Color picker tooltip
this.colorPicker = new SwatchColorPickerTooltip(toolbox.doc,
@@ -120,10 +116,6 @@ TooltipsOverlay.prototype = {
this.cubicBezier.destroy();
}
- if (this.cssDocs) {
- this.cssDocs.destroy();
- }
-
if (this.filterEditor) {
this.filterEditor.destroy();
}
@@ -191,10 +183,6 @@ TooltipsOverlay.prototype = {
this.cubicBezier.hide();
}
- if (this.isRuleView && this.cssDocs.tooltip.isVisible()) {
- this.cssDocs.hide();
- }
-
if (this.isRuleView && this.filterEditor.tooltip.isVisible()) {
this.filterEditor.revert();
this.filterEdtior.hide();
@@ -295,10 +283,6 @@ TooltipsOverlay.prototype = {
this.cubicBezier.hide();
}
- if (this.cssDocs) {
- this.cssDocs.hide();
- }
-
if (this.filterEditor) {
this.filterEditor.hide();
}
diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
index a6334057e3..abedab2914 100644
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -117,7 +117,6 @@ devtools.jar:
content/framework/connect/connect.js (framework/connect/connect.js)
content/shared/widgets/graphs-frame.xhtml (shared/widgets/graphs-frame.xhtml)
content/shared/widgets/cubic-bezier.css (shared/widgets/cubic-bezier.css)
- content/shared/widgets/mdn-docs.css (shared/widgets/mdn-docs.css)
content/shared/widgets/filter-widget.css (shared/widgets/filter-widget.css)
content/shared/widgets/spectrum.css (shared/widgets/spectrum.css)
content/aboutdebugging/aboutdebugging.xhtml (aboutdebugging/aboutdebugging.xhtml)
diff --git a/devtools/client/locales/en-US/inspector.properties b/devtools/client/locales/en-US/inspector.properties
index 252d72bfa4..01064fd183 100644
--- a/devtools/client/locales/en-US/inspector.properties
+++ b/devtools/client/locales/en-US/inspector.properties
@@ -48,14 +48,6 @@ eyedropper.disabled.title=Unavailable in non-HTML documents
#LOCALIZATION NOTE: Used in the image preview tooltip when the image could not be loaded
eventsTooltip.openInDebugger=Open in Debugger
-# LOCALIZATION NOTE (docsTooltip.visitMDN): Shown in the tooltip that displays
-# help from MDN. This is a link to the complete MDN documentation page.
-docsTooltip.visitMDN=Visit MDN page
-
-# LOCALIZATION NOTE (docsTooltip.visitMDN): Shown in the docs tooltip when the MDN page
-# could not be loaded (for example, because of a connectivity problem).
-docsTooltip.loadDocsError=Could not load docs page.
-
# LOCALIZATION NOTE (inspector.collapsePane): This is the tooltip for the button
# that collapses the right panel (rules, computed, box-model, etc...) in the
# inspector UI.
diff --git a/devtools/client/preferences/devtools.js b/devtools/client/preferences/devtools.js
index fb018d81ab..34fa9b8836 100644
--- a/devtools/client/preferences/devtools.js
+++ b/devtools/client/preferences/devtools.js
@@ -47,8 +47,6 @@ pref("devtools.inspector.imagePreviewTooltipSize", 300);
pref("devtools.inspector.showUserAgentStyles", false);
// Show all native anonymous content (like controls in