Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (183332 => 183333)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:21:38 UTC (rev 183332)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:22:10 UTC (rev 183333)
@@ -1,5 +1,38 @@
2015-04-23 Timothy Hatcher <[email protected]>
+ Web Inspector: Change more places that changed WebInspector.navigationSidebar.selectedSidebarPanel to tabs
+ https://bugs.webkit.org/show_bug.cgi?id=144125
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.loaded):
+ (WebInspector.toggleDetailsSidebar):
+ (WebInspector.tabContentViewClassForRepresentedObject):
+ (WebInspector._updateModifierKeys):
+ (WebInspector._consoleResizerMouseDown.dockedResizerDragEnd):
+ (WebInspector._consoleResizerMouseDown):
+ (WebInspector.linkifyURLAsNode):
+ (WebInspector.linkifyStringAsFragmentWithCustomLinkifier):
+ * UserInterface/Protocol/InspectorFrontendAPI.js:
+ (InspectorFrontendAPI.setTimelineProfilingEnabled):
+ (InspectorFrontendAPI.showConsole):
+ (InspectorFrontendAPI.showResources):
+ * UserInterface/Protocol/InspectorObserver.js:
+ (WebInspector.InspectorObserver.prototype.inspect):
+ * UserInterface/Views/DebuggerTabContentView.js:
+ (WebInspector.DebuggerTabContentView.prototype.canShowRepresentedObject):
+ (WebInspector.DebuggerTabContentView.prototype.revealAndSelectBreakpoint):
+ * UserInterface/Views/DefaultDashboardView.js:
+ (WebInspector.DefaultDashboardView):
+ (WebInspector.DefaultDashboardView.prototype._resourcesWasClicked):
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor.prototype.textEditorGutterContextMenu.revealInSidebar):
+ * UserInterface/Views/TabBrowser.js:
+ (WebInspector.TabBrowser.bestTabContentViewForClass):
+
+2015-04-23 Timothy Hatcher <[email protected]>
+
Web Inspector: Make Console work in a tab world
https://bugs.webkit.org/show_bug.cgi?id=144112
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (183332 => 183333)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-04-26 01:21:38 UTC (rev 183332)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-04-26 01:22:10 UTC (rev 183333)
@@ -127,6 +127,8 @@
this.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.Resumed, this._debuggerDidResume, this);
this.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.InspectModeStateChanged, this._inspectModeStateChanged, this);
this.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.DOMNodeWasInspected, this._domNodeWasInspected, this);
+ this.storageManager.addEventListener(WebInspector.StorageManager.Event.DOMStorageObjectWasInspected, this._storageWasInspected, this);
+ this.storageManager.addEventListener(WebInspector.StorageManager.Event.DatabaseWasInspected, this._storageWasInspected, this);
this.frameResourceManager.addEventListener(WebInspector.FrameResourceManager.Event.MainFrameDidChange, this._mainFrameDidChange, this);
this.frameResourceManager.addEventListener(WebInspector.FrameResourceManager.Event.FrameWasAdded, this._frameWasAdded, this);
@@ -653,6 +655,42 @@
return this.tabBrowser.selectedTabContentView instanceof WebInspector.ConsoleTabContentView;
};
+WebInspector.showElementsTab = function()
+{
+ var tabContentView = this.tabBrowser.bestTabContentViewForClass(WebInspector.ElementsTabContentView);
+ if (!tabContentView)
+ tabContentView = new WebInspector.ElementsTabContentView;
+ this.tabBrowser.showTabForContentView(tabContentView);
+};
+
+WebInspector.showDebuggerTab = function(breakpointToSelect)
+{
+ var tabContentView = this.tabBrowser.bestTabContentViewForClass(WebInspector.DebuggerTabContentView);
+ if (!tabContentView)
+ tabContentView = new WebInspector.DebuggerTabContentView;
+
+ if (breakpointToSelect instanceof WebInspector.Breakpoint)
+ tabContentView.revealAndSelectBreakpoint(breakpointToSelect);
+
+ this.tabBrowser.showTabForContentView(tabContentView);
+};
+
+WebInspector.showResourcesTab = function()
+{
+ var tabContentView = this.tabBrowser.bestTabContentViewForClass(WebInspector.ResourcesTabContentView);
+ if (!tabContentView)
+ tabContentView = new WebInspector.ResourcesTabContentView;
+ this.tabBrowser.showTabForContentView(tabContentView);
+};
+
+WebInspector.showTimelineTab = function()
+{
+ var tabContentView = this.tabBrowser.bestTabContentViewForClass(WebInspector.TimelineTabContentView);
+ if (!tabContentView)
+ tabContentView = new WebInspector.TimelineTabContentView;
+ this.tabBrowser.showTabForContentView(tabContentView);
+};
+
WebInspector.UIString = function(string, vararg)
{
if (WebInspector.dontLocalizeUserInterface)
@@ -923,13 +961,10 @@
WebInspector._debuggerDidPause = function(event)
{
- this.debuggerSidebarPanel.show();
+ this.showDebuggerTab();
+
this.dashboardContainer.showDashboardViewForRepresentedObject(this.dashboardManager.dashboards.debugger);
- // Since the Scope Chain details sidebar panel might not be in the sidebar yet,
- // set a flag to select and show it when it does become available.
- this._selectAndShowScopeChainDetailsSidebarPanelWhenAvailable = true;
-
InspectorFrontendHost.bringToFront();
};
@@ -1169,17 +1204,6 @@
this._updateContentViewForCurrentNavigationSidebar();
};
-WebInspector._domNodeWasInspected = function(event)
-{
- WebInspector.domTreeManager.highlightDOMNodeForTwoSeconds(event.data.node.id);
-
- // Select the Style details sidebar panel if one of the DOM details sidebar panels isn't already selected.
- if (!(this.detailsSidebar.selectedSidebarPanel instanceof WebInspector.DOMDetailsSidebarPanel))
- this.detailsSidebar.selectedSidebarPanel = this.cssStyleDetailsSidebarPanel;
-
- InspectorFrontendHost.bringToFront();
-};
-
WebInspector._contentBrowserSizeDidChange = function(event)
{
this.contentBrowser.updateLayout();
@@ -1605,6 +1629,21 @@
WebInspector.elementDragStart(event.target, toolbarDrag, toolbarDragEnd, event, "default");
};
+WebInspector._storageWasInspected = function(event)
+{
+ // FIXME: This should show a Storage tab when we have one.
+ this.showResourcesTab();
+};
+
+WebInspector._domNodeWasInspected = function(event)
+{
+ WebInspector.domTreeManager.highlightDOMNodeForTwoSeconds(event.data.node.id);
+
+ InspectorFrontendHost.bringToFront();
+
+ this.showMainFrameDOMTree(event.data.node);
+};
+
WebInspector._inspectModeStateChanged = function(event)
{
this._inspectModeToolbarButton.activated = WebInspector.domTreeManager.inspectModeEnabled;
Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js (183332 => 183333)
--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js 2015-04-26 01:21:38 UTC (rev 183332)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js 2015-04-26 01:22:10 UTC (rev 183333)
@@ -48,8 +48,7 @@
return;
if (enabled) {
- WebInspector.navigationSidebar.selectedSidebarPanel = WebInspector.timelineSidebarPanel;
- WebInspector.timelineSidebarPanel.showTimelineOverview();
+ WebInspector.showTimelineTab();
WebInspector.timelineManager.startCapturing();
} else {
WebInspector.timelineManager.stopCapturing();
@@ -84,14 +83,11 @@
showResources: function()
{
- WebInspector.ignoreLastContentCookie = true;
- WebInspector.navigationSidebar.selectedSidebarPanel = WebInspector.resourceSidebarPanel;
- WebInspector.navigationSidebar.collapsed = false;
+ WebInspector.showResourcesTab();
},
showMainResourceForFrame: function(frameIdentifier)
{
- WebInspector.ignoreLastContentCookie = true;
WebInspector.showSourceCodeForFrame(frameIdentifier, true);
},
Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js (183332 => 183333)
--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js 2015-04-26 01:21:38 UTC (rev 183332)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js 2015-04-26 01:22:10 UTC (rev 183333)
@@ -42,7 +42,6 @@
var remoteObject = WebInspector.RemoteObject.fromPayload(payload);
if (remoteObject.subtype === "node") {
WebInspector.domTreeManager.inspectNodeObject(remoteObject);
- WebInspector.navigationSidebar.selectedSidebarPanel = WebInspector.resourceSidebarPanel;
return;
}
@@ -51,8 +50,6 @@
else if (hints.domStorageId)
WebInspector.storageManager.inspectDOMStorage(hints.domStorageId);
- WebInspector.navigationSidebar.selectedSidebarPanel = WebInspector.resourceSidebarPanel;
-
remoteObject.release();
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js (183332 => 183333)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js 2015-04-26 01:21:38 UTC (rev 183332)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js 2015-04-26 01:22:10 UTC (rev 183333)
@@ -54,6 +54,15 @@
return false;
return representedObject.type === WebInspector.Resource.Type.Document || representedObject.type === WebInspector.Resource.Type.Script;
+ },
+
+ revealAndSelectBreakpoint: function(breakpoint)
+ {
+ console.assert(breakpoint instanceof WebInspector.Breakpoint);
+
+ var treeElement = this.navigationSidebarPanel.treeElementForRepresentedObject(breakpoint);
+ if (treeElement)
+ treeElement.revealAndSelect();
}
};
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js (183332 => 183333)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js 2015-04-26 01:21:38 UTC (rev 183332)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js 2015-04-26 01:22:10 UTC (rev 183333)
@@ -33,19 +33,19 @@
this._items = {
resourcesCount: {
- tooltip: WebInspector.UIString("Total number of resources, click to show the Resources navigation sidebar"),
+ tooltip: WebInspector.UIString("Total number of resources, click to show the Resources tab"),
handler: this._resourcesWasClicked
},
logs: {
- tooltip: WebInspector.UIString("Console logs, click to show the Console"),
+ tooltip: WebInspector.UIString("Console logs, click to show the Console tab"),
handler: this._consoleItemWasClicked.bind(this, WebInspector.LogContentView.Scopes.Logs)
},
errors: {
- tooltip: WebInspector.UIString("Console errors, click to show the Console"),
+ tooltip: WebInspector.UIString("Console errors, click to show the Console tab"),
handler: this._consoleItemWasClicked.bind(this, WebInspector.LogContentView.Scopes.Errors)
},
issues: {
- tooltip: WebInspector.UIString("Console warnings, click to show the Console"),
+ tooltip: WebInspector.UIString("Console warnings, click to show the Console tab"),
handler: this._consoleItemWasClicked.bind(this, WebInspector.LogContentView.Scopes.Warnings)
}
};
@@ -111,15 +111,9 @@
_resourcesWasClicked()
{
- WebInspector.navigationSidebar.selectedSidebarPanel = WebInspector.resourceSidebarPanel;
- WebInspector.navigationSidebar.collapsed = false;
+ WebInspector.showResourcesTab();
}
- _networkItemWasClicked()
- {
- WebInspector.navigationSidebar.selectedSidebarPanel = WebInspector.timelineSidebarPanel;
- }
-
_consoleItemWasClicked(scope)
{
WebInspector.showConsoleTab(scope);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (183332 => 183333)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-04-26 01:21:38 UTC (rev 183332)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-04-26 01:22:10 UTC (rev 183333)
@@ -987,10 +987,7 @@
function revealInSidebar()
{
- WebInspector.debuggerSidebarPanel.show();
- var treeElement = WebInspector.debuggerSidebarPanel.treeElementForRepresentedObject(breakpoint);
- if (treeElement)
- treeElement.revealAndSelect();
+ WebInspector.showDebuggerTab(breakpoint);
}
var contextMenu = new WebInspector.ContextMenu(event);
@@ -1036,7 +1033,7 @@
breakpoint.appendContextMenuItems(contextMenu, event.target);
contextMenu.appendSeparator();
- contextMenu.appendItem(WebInspector.UIString("Reveal in Debugger Navigation Sidebar"), revealInSidebar);
+ contextMenu.appendItem(WebInspector.UIString("Reveal in Debugger Tab"), revealInSidebar);
contextMenu.show();
return;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js (183332 => 183333)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js 2015-04-26 01:21:38 UTC (rev 183332)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js 2015-04-26 01:22:10 UTC (rev 183333)
@@ -92,6 +92,18 @@
this._contentViewContainer.updateLayout();
}
+ bestTabContentViewForClass(constructor)
+ {
+ console.assert(!this.selectedTabContentView || this.selectedTabContentView === this._recentTabContentViews[0]);
+
+ for (var tabContentView of this._recentTabContentViews) {
+ if (tabContentView instanceof constructor)
+ return tabContentView;
+ }
+
+ return null;
+ }
+
bestTabContentViewForRepresentedObject(representedObject)
{
console.assert(!this.selectedTabContentView || this.selectedTabContentView === this._recentTabContentViews[0]);
