Index: Source/devtools/front_end/elements/ElementsPanel.js |
diff --git a/Source/devtools/front_end/elements/ElementsPanel.js b/Source/devtools/front_end/elements/ElementsPanel.js |
index cf79afabfbf7ba7d29f6d14ef7b2e4835aecae0f..2ac546b570b67b41d074546b602315ffd3e19afc 100644 |
--- a/Source/devtools/front_end/elements/ElementsPanel.js |
+++ b/Source/devtools/front_end/elements/ElementsPanel.js |
@@ -103,8 +103,6 @@ WebInspector.ElementsPanel = function() |
WebInspector.targetManager.observeTargets(this); |
WebInspector.moduleSetting("showUAShadowDOM").addChangeListener(this._showUAShadowDOMChanged.bind(this)); |
WebInspector.targetManager.addModelListener(WebInspector.DOMModel, WebInspector.DOMModel.Events.DocumentUpdated, this._documentUpdatedEvent, this); |
- if (Runtime.experiments.isEnabled("materialDesign")) |
- WebInspector.targetManager.addModelListener(WebInspector.DOMModel, WebInspector.DOMModel.Events.MarkersChanged, this._updateToolbarButtons, this); |
WebInspector.extensionServer.addEventListener(WebInspector.ExtensionServer.Events.SidebarPaneAdded, this._extensionSidebarPaneAdded, this); |
} |
@@ -117,22 +115,6 @@ WebInspector.ElementsPanel.prototype = { |
_createElementsToolbar: function() |
{ |
var toolbar = new WebInspector.ExtensibleToolbar("elements-toolbar"); |
- toolbar.element.classList.add("elements-toolbar"); |
- this._hideElementButton = new WebInspector.ToolbarButton(WebInspector.UIString("Hide element"), "visibility-off-toolbar-item"); |
- this._hideElementButton.setAction("elements.hide-element"); |
- toolbar.appendToolbarItem(this._hideElementButton); |
- |
- this._editAsHTMLButton = new WebInspector.ToolbarButton(WebInspector.UIString("Edit as HTML"), "edit-toolbar-item"); |
- this._editAsHTMLButton.setAction("elements.edit-as-html"); |
- toolbar.appendToolbarItem(this._editAsHTMLButton); |
- toolbar.appendSeparator(); |
- |
- this._forceElementStateButton = new WebInspector.ToolbarMenuButton(WebInspector.UIString("Force element state"), "pin-toolbar-item", this._showForceElementStateMenu.bind(this)); |
- toolbar.appendToolbarItem(this._forceElementStateButton); |
- this._breakpointsButton = new WebInspector.ToolbarMenuButton(WebInspector.UIString("Toggle breakpoints"), "add-breakpoint-toolbar-item", this._showBreakpointsMenu.bind(this)); |
- toolbar.appendToolbarItem(this._breakpointsButton); |
- |
- toolbar.appendSeparator(); |
if (Runtime.experiments.isEnabled("layoutEditor") && !Runtime.queryParam("remoteFrontend")) { |
this._layoutEditorButton = new WebInspector.ToolbarButton(WebInspector.UIString("Toggle Layout Editor"), "layout-editor-toolbar-item"); |
toolbar.appendToolbarItem(this._layoutEditorButton); |
@@ -151,58 +133,13 @@ WebInspector.ElementsPanel.prototype = { |
treeOutline.toggleHideElement(node); |
}, |
- _updateToolbarButtons: function() |
- { |
- if (!Runtime.experiments.isEnabled("materialDesign")) |
- return; |
- var node = this.selectedDOMNode(); |
- if (!node) |
- return; |
- var classText = node.getAttribute("class"); |
- var treeOutline = this._treeOutlineForNode(node); |
- this._hideElementButton.setToggled(treeOutline && treeOutline.isToggledToHidden(node)); |
- this._editAsHTMLButton.setToggled(false); |
- this._breakpointsButton.setEnabled(!node.pseudoType()); |
- this._breakpointsButton.setToggled(WebInspector.domBreakpointsSidebarPane.hasBreakpoints(node)); |
- this._forceElementStateButton.setEnabled(node.nodeType() === Node.ELEMENT_NODE && !node.pseudoType()); |
- this._forceElementStateButton.setToggled(!!WebInspector.CSSStyleModel.fromNode(node).pseudoState(node).length); |
- }, |
- |
_toggleEditAsHTML: function() |
{ |
var node = this.selectedDOMNode(); |
var treeOutline = this._treeOutlineForNode(node); |
if (!node || !treeOutline) |
return; |
- |
- var startEditing = true; |
- if (Runtime.experiments.isEnabled("materialDesign")) { |
- startEditing = !this._editAsHTMLButton.toggled(); |
- this._editAsHTMLButton.setToggled(startEditing); |
- } |
- treeOutline.toggleEditAsHTML(node, startEditing, this._updateToolbarButtons.bind(this)); |
- }, |
- |
- /** |
- * @param {!WebInspector.ContextMenu} contextMenu |
- */ |
- _showBreakpointsMenu: function(contextMenu) |
- { |
- var node = this.selectedDOMNode(); |
- if (!node) |
- return; |
- WebInspector.domBreakpointsSidebarPane.populateNodeContextMenu(node, contextMenu, false); |
- }, |
- |
- /** |
- * @param {!WebInspector.ContextMenu} contextMenu |
- */ |
- _showForceElementStateMenu: function(contextMenu) |
- { |
- var node = this.selectedDOMNode(); |
- if (!node) |
- return; |
- WebInspector.ElementsTreeElement.populateForcedPseudoStateItems(contextMenu, node); |
+ treeOutline.toggleEditAsHTML(node); |
}, |
_loadSidebarViews: function() |
@@ -398,8 +335,6 @@ WebInspector.ElementsPanel.prototype = { |
} |
WebInspector.notifications.dispatchEventToListeners(WebInspector.NotificationService.Events.SelectedNodeChanged); |
this._selectedNodeChangedForTest(); |
- if (Runtime.experiments.isEnabled("materialDesign")) |
- this._updateToolbarButtons(); |
}, |
_selectedNodeChangedForTest: function() { }, |