Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (183326 => 183327)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:17:57 UTC (rev 183326)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:18:35 UTC (rev 183327)
@@ -1,5 +1,52 @@
2015-04-22 Timothy Hatcher <[email protected]>
+ Web Inspector: Remove sidebar panel shortcut and image
+ https://bugs.webkit.org/show_bug.cgi?id=144061
+
+ Sidebar panels no longer need a keyboard shortcut or a toolbar image.
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/ApplicationCacheDetailsSidebarPanel.js:
+ (WebInspector.ApplicationCacheDetailsSidebarPanel):
+ * UserInterface/Views/CSSStyleDetailsSidebarPanel.js:
+ (WebInspector.CSSStyleDetailsSidebarPanel):
+ * UserInterface/Views/DOMDetailsSidebarPanel.js:
+ (WebInspector.DOMDetailsSidebarPanel):
+ * UserInterface/Views/DOMNodeDetailsSidebarPanel.js:
+ (WebInspector.DOMNodeDetailsSidebarPanel):
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ * UserInterface/Views/DetailsSidebarPanel.js:
+ (WebInspector.DetailsSidebarPanel):
+ * UserInterface/Views/LayerTreeDetailsSidebarPanel.js:
+ (WebInspector.LayerTreeDetailsSidebarPanel):
+ * UserInterface/Views/NavigationSidebarPanel.js:
+ (WebInspector.NavigationSidebarPanel):
+ (WebInspector.NavigationSidebarPanel.prototype.restoreStateFromCookie):
+ (WebInspector.NavigationSidebarPanel.prototype.showEmptyContentPlaceholder):
+ (WebInspector.NavigationSidebarPanel.prototype.applyFiltersToTreeElement):
+ (WebInspector.NavigationSidebarPanel.prototype.show):
+ (WebInspector.NavigationSidebarPanel.prototype._updateContentOverflowShadowVisibility):
+ * UserInterface/Views/ProbeDetailsSidebarPanel.js:
+ (WebInspector.ProbeDetailsSidebarPanel):
+ * UserInterface/Views/RenderingFrameDetailsSidebarPanel.js:
+ * UserInterface/Views/ResourceDetailsSidebarPanel.js:
+ (WebInspector.ResourceDetailsSidebarPanel):
+ * UserInterface/Views/ResourceSidebarPanel.js:
+ (WebInspector.ResourceSidebarPanel):
+ * UserInterface/Views/ScopeChainDetailsSidebarPanel.js:
+ (WebInspector.ScopeChainDetailsSidebarPanel):
+ * UserInterface/Views/SidebarPanel.js:
+ (WebInspector.SidebarPanel):
+ (WebInspector.SidebarPanel.prototype.added):
+ (WebInspector.SidebarPanel.prototype.removed):
+ (WebInspector.SidebarPanel.prototype.visibilityDidChange):
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel):
+ (WebInspector.TimelineSidebarPanel.prototype.showTimelineViewForTimeline):
+
+2015-04-22 Timothy Hatcher <[email protected]>
+
Web Inspector: Remove allowedNavigationSidebarPanels, it isn't needed
https://bugs.webkit.org/show_bug.cgi?id=144056
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheDetailsSidebarPanel.js (183326 => 183327)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheDetailsSidebarPanel.js 2015-04-26 01:17:57 UTC (rev 183326)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheDetailsSidebarPanel.js 2015-04-26 01:18:35 UTC (rev 183327)
@@ -27,7 +27,7 @@
{
constructor()
{
- super("application-cache-details", WebInspector.UIString("Storage"), WebInspector.UIString("Storage"), "Images/NavigationItemStorage.svg");
+ super("application-cache-details", WebInspector.UIString("Storage"), WebInspector.UIString("Storage"));
this.element.classList.add("application-cache");
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDetailsSidebarPanel.js (183326 => 183327)
--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDetailsSidebarPanel.js 2015-04-26 01:17:57 UTC (rev 183326)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDetailsSidebarPanel.js 2015-04-26 01:18:35 UTC (rev 183327)
@@ -27,7 +27,7 @@
{
constructor()
{
- super("css-style", WebInspector.UIString("Styles"), WebInspector.UIString("Style"), "Images/NavigationItemBrushAndRuler.svg", "4");
+ super("css-style", WebInspector.UIString("Styles"), WebInspector.UIString("Style"));
this._selectedPanel = null;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMDetailsSidebarPanel.js (183326 => 183327)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMDetailsSidebarPanel.js 2015-04-26 01:17:57 UTC (rev 183326)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMDetailsSidebarPanel.js 2015-04-26 01:18:35 UTC (rev 183327)
@@ -25,9 +25,9 @@
WebInspector.DOMDetailsSidebarPanel = class DOMDetailsSidebarPanel extends WebInspector.DetailsSidebarPanel
{
- constructor(identifier, displayName, singularDisplayName, image, keyboardShortcutKey, element)
+ constructor(identifier, displayName, singularDisplayName, element)
{
- super(identifier, displayName, singularDisplayName, image, keyboardShortcutKey, element);
+ super(identifier, displayName, singularDisplayName, element);
this.element.addEventListener("click", this._mouseWasClicked.bind(this), true);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js (183326 => 183327)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js 2015-04-26 01:17:57 UTC (rev 183326)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js 2015-04-26 01:18:35 UTC (rev 183327)
@@ -27,7 +27,7 @@
{
constructor()
{
- super("dom-node-details", WebInspector.UIString("Node"), WebInspector.UIString("Node"), "Images/NavigationItemAngleBrackets.svg", "2");
+ super("dom-node-details", WebInspector.UIString("Node"), WebInspector.UIString("Node"));
WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.AttributeModified, this._attributesChanged, this);
WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.AttributeRemoved, this._attributesChanged, this);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (183326 => 183327)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2015-04-26 01:17:57 UTC (rev 183326)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2015-04-26 01:18:35 UTC (rev 183327)
@@ -27,7 +27,7 @@
{
constructor()
{
- super("debugger", WebInspector.UIString("Debugger"), "Images/NavigationItemBug.svg", "3", true);
+ super("debugger", WebInspector.UIString("Debugger"), true);
WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceChanged, this);
WebInspector.Frame.addEventListener(WebInspector.Frame.Event.ResourceWasAdded, this._resourceAdded, this);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSidebarPanel.js (183326 => 183327)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSidebarPanel.js 2015-04-26 01:17:57 UTC (rev 183326)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSidebarPanel.js 2015-04-26 01:18:35 UTC (rev 183327)
@@ -25,26 +25,10 @@
WebInspector.DetailsSidebarPanel = class DetailsSidebarPanel extends WebInspector.SidebarPanel
{
- constructor(identifier, displayName, singularDisplayName, image, keyboardShortcutKey, element)
+ constructor(identifier, displayName, singularDisplayName, element)
{
- var keyboardShortcut = null;
- if (keyboardShortcutKey)
- keyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Control | WebInspector.KeyboardShortcut.Modifier.Shift, keyboardShortcutKey);
+ super(identifier, displayName, element);
- if (keyboardShortcut) {
- var showToolTip = WebInspector.UIString("Show the %s details sidebar (%s)").format(singularDisplayName, keyboardShortcut.displayName);
- var hideToolTip = WebInspector.UIString("Hide the %s details sidebar (%s)").format(singularDisplayName, keyboardShortcut.displayName);
- } else {
- var showToolTip = WebInspector.UIString("Show the %s details sidebar").format(singularDisplayName);
- var hideToolTip = WebInspector.UIString("Hide the %s details sidebar").format(singularDisplayName);
- }
-
- super(identifier, displayName, showToolTip, hideToolTip, image, element);
-
- this._keyboardShortcut = keyboardShortcut;
- if (this._keyboardShortcut)
- this._keyboardShortcut.callback = this.toggle.bind(this);
-
this.element.classList.add("details");
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js (183326 => 183327)
--- trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js 2015-04-26 01:17:57 UTC (rev 183326)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js 2015-04-26 01:18:35 UTC (rev 183327)
@@ -27,7 +27,7 @@
{
constructor()
{
- super("layer-tree", WebInspector.UIString("Layers"), WebInspector.UIString("Layer"), "Images/NavigationItemLayers.svg", "3");
+ super("layer-tree", WebInspector.UIString("Layers"), WebInspector.UIString("Layer"));
this._dataGridNodesByLayerId = {};
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (183326 => 183327)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2015-04-26 01:17:57 UTC (rev 183326)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2015-04-26 01:18:35 UTC (rev 183327)
@@ -25,32 +25,12 @@
WebInspector.NavigationSidebarPanel = class NavigationSidebarPanel extends WebInspector.SidebarPanel
{
- constructor(identifier, displayName, image, keyboardShortcutKey, autoPruneOldTopLevelResourceTreeElements, autoHideToolbarItemWhenEmpty, wantsTopOverflowShadow, element, role, label)
+ constructor(identifier, displayName, autoPruneOldTopLevelResourceTreeElements, wantsTopOverflowShadow, element, role, label)
{
- var keyboardShortcut = null;
- if (keyboardShortcutKey)
- keyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Control, keyboardShortcutKey);
+ super(identifier, displayName, element, role, label || displayName);
- if (keyboardShortcut) {
- var showToolTip = WebInspector.UIString("Show the %s navigation sidebar (%s)").format(displayName, keyboardShortcut.displayName);
- var hideToolTip = WebInspector.UIString("Hide the %s navigation sidebar (%s)").format(displayName, keyboardShortcut.displayName);
- } else {
- var showToolTip = WebInspector.UIString("Show the %s navigation sidebar").format(displayName);
- var hideToolTip = WebInspector.UIString("Hide the %s navigation sidebar").format(displayName);
- }
-
- super(identifier, displayName, showToolTip, hideToolTip, image, element, role, label || displayName);
-
this.element.classList.add("navigation");
- this._keyboardShortcut = keyboardShortcut;
- this._keyboardShortcut.callback = this.toggle.bind(this);
-
- this._autoHideToolbarItemWhenEmpty = autoHideToolbarItemWhenEmpty || false;
-
- if (autoHideToolbarItemWhenEmpty)
- this.toolbarItem.hidden = true;
-
this._visibleContentTreeOutlines = new Set;
this.contentElement.addEventListener("scroll", this._updateContentOverflowShadowVisibility.bind(this));
@@ -244,7 +224,7 @@
this._finalAttemptToRestoreViewStateTimeout = setTimeout(finalAttemptToRestoreViewStateFromCookie.bind(this), relaxedMatchDelay);
}
- showEmptyContentPlaceholder(message, hideToolbarItem)
+ showEmptyContentPlaceholder(message)
{
console.assert(message);
@@ -254,8 +234,6 @@
this._emptyContentPlaceholderMessageElement.textContent = message;
this.element.appendChild(this._emptyContentPlaceholderElement);
- this._hideToolbarItemWhenEmpty = hideToolbarItem || false;
- this._updateToolbarItemVisibility();
this._updateContentOverflowShadowVisibility();
}
@@ -266,15 +244,11 @@
this._emptyContentPlaceholderElement.parentNode.removeChild(this._emptyContentPlaceholderElement);
- this._hideToolbarItemWhenEmpty = false;
- this._updateToolbarItemVisibility();
this._updateContentOverflowShadowVisibility();
}
updateEmptyContentPlaceholder(message)
{
- this._updateToolbarItemVisibility();
-
if (!this._contentTreeOutline.children.length) {
// No tree elements, so no results.
this.showEmptyContentPlaceholder(message);
@@ -398,29 +372,18 @@
if (!this.parentSidebar)
return;
- WebInspector.SidebarPanel.prototype.show.call(this);
+ super.show();
this.contentTreeOutlineElement.focus();
}
shown()
{
- WebInspector.SidebarPanel.prototype.shown.call(this);
+ super.shown();
this._updateContentOverflowShadowVisibility();
-
- // Force the navigation item to be visible. This makes sure it is
- // always visible when the panel is shown.
- this.toolbarItem.hidden = false;
}
- hidden()
- {
- WebInspector.SidebarPanel.prototype.hidden.call(this);
-
- this._updateToolbarItemVisibility();
- }
-
// Private
_updateContentOverflowShadowVisibilitySoon()
@@ -460,13 +423,6 @@
this._bottomOverflowShadowElement.style.opacity = (1 - (bottomCoverage / edgeThreshold)).toFixed(1);
}
- _updateToolbarItemVisibility()
- {
- // Hide the navigation item if requested or auto-hiding and we are not visible and we are empty.
- var shouldHide = ((this._hideToolbarItemWhenEmpty || this._autoHideToolbarItemWhenEmpty) && !this.selected && !this._contentTreeOutline.children.length);
- this.toolbarItem.hidden = shouldHide;
- }
-
_checkForEmptyFilterResults()
{
// No tree elements, so don't touch the empty content placeholder.
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ProbeDetailsSidebarPanel.js (183326 => 183327)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ProbeDetailsSidebarPanel.js 2015-04-26 01:17:57 UTC (rev 183326)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ProbeDetailsSidebarPanel.js 2015-04-26 01:18:35 UTC (rev 183327)
@@ -28,7 +28,7 @@
{
constructor()
{
- super("probe", WebInspector.UIString("Probes"), WebInspector.UIString("Probes"), "Images/NavigationItemProbes.svg", "6");
+ super("probe", WebInspector.UIString("Probes"), WebInspector.UIString("Probes"));
WebInspector.probeManager.addEventListener(WebInspector.ProbeManager.Event.ProbeSetAdded, this._probeSetAdded, this);
WebInspector.probeManager.addEventListener(WebInspector.ProbeManager.Event.ProbeSetRemoved, this._probeSetRemoved, this);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameDetailsSidebarPanel.js (183326 => 183327)
--- trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameDetailsSidebarPanel.js 2015-04-26 01:17:57 UTC (rev 183326)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameDetailsSidebarPanel.js 2015-04-26 01:18:35 UTC (rev 183327)
@@ -27,7 +27,7 @@
{
constructor()
{
- super("rendering-frame-details", WebInspector.UIString("Frames"), WebInspector.UIString("Frames"), "Images/NavigationItemDoughnutChart.svg");
+ super("rendering-frame-details", WebInspector.UIString("Frames"));
this._frameRangeRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Frames"));
this._timeRangeRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Time"));
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js (183326 => 183327)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js 2015-04-26 01:17:57 UTC (rev 183326)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js 2015-04-26 01:18:35 UTC (rev 183327)
@@ -27,7 +27,7 @@
{
constructor()
{
- super("resource-details", WebInspector.UIString("Resource"), WebInspector.UIString("Resource"), "Images/NavigationItemFile.svg", "1");
+ super("resource-details", WebInspector.UIString("Resource"), WebInspector.UIString("Resource"));
this.element.classList.add("resource");
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js (183326 => 183327)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2015-04-26 01:17:57 UTC (rev 183326)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2015-04-26 01:18:35 UTC (rev 183327)
@@ -27,7 +27,7 @@
{
constructor()
{
- super("resource", WebInspector.UIString("Resources"), "Images/NavigationItemStorage.svg", "1", true, false, true);
+ super("resource", WebInspector.UIString("Resources"), true, true);
var searchElement = document.createElement("div");
searchElement.classList.add("search-bar");
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js (183326 => 183327)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js 2015-04-26 01:17:57 UTC (rev 183326)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js 2015-04-26 01:18:35 UTC (rev 183327)
@@ -27,7 +27,7 @@
{
constructor()
{
- super("scope-chain", WebInspector.UIString("Scope Chain"), WebInspector.UIString("Scope Chain"), "Images/NavigationItemVariable.svg", "5");
+ super("scope-chain", WebInspector.UIString("Scope Chain"), WebInspector.UIString("Scope Chain"));
this._callFrame = null;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SidebarPanel.js (183326 => 183327)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SidebarPanel.js 2015-04-26 01:17:57 UTC (rev 183326)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SidebarPanel.js 2015-04-26 01:18:35 UTC (rev 183327)
@@ -25,16 +25,12 @@
WebInspector.SidebarPanel = class SidebarPanel extends WebInspector.Object
{
- constructor(identifier, displayName, showToolTip, hideToolTip, image, element, role, label)
+ constructor(identifier, displayName, element, role, label)
{
super();
this._identifier = identifier;
- this._toolbarItem = new WebInspector.ActivateButtonToolbarItem(identifier, showToolTip, hideToolTip, displayName, image, null, "tab");
- this._toolbarItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this.toggle, this);
- this._toolbarItem.enabled = false;
-
this._element = element || document.createElement("div");
this._element.classList.add("panel", identifier);
@@ -53,11 +49,6 @@
return this._identifier;
}
- get toolbarItem()
- {
- return this._toolbarItem;
- }
-
get element()
{
return this._element;
@@ -120,15 +111,15 @@
added()
{
console.assert(this._parentSidebar);
- this._toolbarItem.enabled = true;
- this._toolbarItem.activated = this.visible;
+
+ // Implemented by subclasses.
}
removed()
{
console.assert(!this._parentSidebar);
- this._toolbarItem.enabled = false;
- this._toolbarItem.activated = false;
+
+ // Implemented by subclasses.
}
willRemove()
@@ -153,7 +144,7 @@
visibilityDidChange()
{
- this._toolbarItem.activated = this.visible;
+ // Implemented by subclasses.
}
};
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (183326 => 183327)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-04-26 01:17:57 UTC (rev 183326)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-04-26 01:18:35 UTC (rev 183327)
@@ -27,7 +27,7 @@
{
constructor()
{
- super("timeline", WebInspector.UIString("Timelines"), "Images/NavigationItemStopwatch.svg", "2");
+ super("timeline", WebInspector.UIString("Timelines"));
this._timelineEventsTitleBarElement = document.createElement("div");
this._timelineEventsTitleBarElement.classList.add(WebInspector.TimelineSidebarPanel.TitleBarStyleClass);
@@ -129,7 +129,7 @@
shown()
{
- WebInspector.NavigationSidebarPanel.prototype.shown.call(this);
+ super.shown();
if (this._displayedContentView)
WebInspector.contentBrowser.showContentView(this._displayedContentView);
@@ -254,7 +254,7 @@
updateFilter()
{
- WebInspector.NavigationSidebarPanel.prototype.updateFilter.call(this);
+ super.updateFilter();
this._displayedContentView.filterDidChange();
}
