<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183332] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183332">183332</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-04-25 18:21:38 -0700 (Sat, 25 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Make Console work in a tab world
https://bugs.webkit.org/show_bug.cgi?id=144112
Reviewed by Joseph Pecoraro.
* UserInterface/Base/Main.js:
(WebInspector.contentLoaded):
(WebInspector.isShowingConsoleTab):
(WebInspector.UIString):
(WebInspector.toggleNavigationSidebar):
(WebInspector.toggleDetailsSidebar):
(WebInspector.tabContentViewClassForRepresentedObject):
(WebInspector.linkifyStringAsFragment):
* UserInterface/Images/Console.svg: Added.
* UserInterface/Protocol/InspectorFrontendAPI.js:
(InspectorFrontendAPI.showConsole):
* UserInterface/Views/ConsoleTabContentView.js: Added.
(WebInspector.ConsoleTabContentView):
(WebInspector.ConsoleTabContentView.prototype.shown):
(WebInspector.ConsoleTabContentView.prototype.showRepresentedObject):
(WebInspector.ConsoleTabContentView.prototype.canShowRepresentedObject):
(WebInspector.ConsoleTabContentView.prototype.get supportsSplitContentBrowser):
* UserInterface/Views/DefaultDashboardView.js:
(WebInspector.DefaultDashboardView.prototype._consoleItemWasClicked):
* UserInterface/Views/LogContentView.js:
(WebInspector.LogContentView):
(WebInspector.LogContentView.prototype.get navigationItems):
(WebInspector.LogContentView.prototype.shown):
(WebInspector.LogContentView.prototype.didAppendConsoleMessageView):
(WebInspector.LogContentView.prototype._showConsoleTab):
* UserInterface/Views/LogIcon.css:
(.log-icon .icon):
* UserInterface/Views/Main.css:
(#split-content-browser .hierarchical-path-component.log-icon .icon):
(#split-content-browser .hierarchical-path-component.log-icon .title):
(#split-content-browser .hierarchical-path-component.log-icon select):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMainjs">trunk/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolInspectorFrontendAPIjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDefaultDashboardViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLogIconcss">trunk/Source/WebInspectorUI/UserInterface/Views/LogIcon.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsMaincss">trunk/Source/WebInspectorUI/UserInterface/Views/Main.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesConsolesvg">trunk/Source/WebInspectorUI/UserInterface/Images/Console.svg</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsConsoleTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleTabContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (183331 => 183332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:20:59 UTC (rev 183331)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:21:38 UTC (rev 183332)
</span><span class="lines">@@ -1,5 +1,44 @@
</span><span class="cx"> 2015-04-23 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Make Console work in a tab world
+ https://bugs.webkit.org/show_bug.cgi?id=144112
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.contentLoaded):
+ (WebInspector.isShowingConsoleTab):
+ (WebInspector.UIString):
+ (WebInspector.toggleNavigationSidebar):
+ (WebInspector.toggleDetailsSidebar):
+ (WebInspector.tabContentViewClassForRepresentedObject):
+ (WebInspector.linkifyStringAsFragment):
+ * UserInterface/Images/Console.svg: Added.
+ * UserInterface/Protocol/InspectorFrontendAPI.js:
+ (InspectorFrontendAPI.showConsole):
+ * UserInterface/Views/ConsoleTabContentView.js: Added.
+ (WebInspector.ConsoleTabContentView):
+ (WebInspector.ConsoleTabContentView.prototype.shown):
+ (WebInspector.ConsoleTabContentView.prototype.showRepresentedObject):
+ (WebInspector.ConsoleTabContentView.prototype.canShowRepresentedObject):
+ (WebInspector.ConsoleTabContentView.prototype.get supportsSplitContentBrowser):
+ * UserInterface/Views/DefaultDashboardView.js:
+ (WebInspector.DefaultDashboardView.prototype._consoleItemWasClicked):
+ * UserInterface/Views/LogContentView.js:
+ (WebInspector.LogContentView):
+ (WebInspector.LogContentView.prototype.get navigationItems):
+ (WebInspector.LogContentView.prototype.shown):
+ (WebInspector.LogContentView.prototype.didAppendConsoleMessageView):
+ (WebInspector.LogContentView.prototype._showConsoleTab):
+ * UserInterface/Views/LogIcon.css:
+ (.log-icon .icon):
+ * UserInterface/Views/Main.css:
+ (#split-content-browser .hierarchical-path-component.log-icon .icon):
+ (#split-content-browser .hierarchical-path-component.log-icon .title):
+ (#split-content-browser .hierarchical-path-component.log-icon select):
+
+2015-04-23 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Web Inspector: Make showing a content view work in the tab world
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144110
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (183331 => 183332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-04-26 01:20:59 UTC (rev 183331)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-04-26 01:21:38 UTC (rev 183332)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx">
</span><span class="cx"> this._consoleRepresentedObject = new WebInspector.LogObject;
</span><span class="cx"> this._consoleTreeElement = new WebInspector.LogTreeElement(this._consoleRepresentedObject);
</span><del>- this.consoleContentView = WebInspector.contentBrowser.contentViewForRepresentedObject(this._consoleRepresentedObject);
</del><ins>+ this.consoleContentView = WebInspector.splitContentBrowser.contentViewForRepresentedObject(this._consoleRepresentedObject);
</ins><span class="cx"> this.consoleLogViewController = this.consoleContentView.logViewController;
</span><span class="cx">
</span><span class="cx"> // FIXME: The sidebars should be flipped in RTL languages.
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> this._reloadPageKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "R", this._reloadPage.bind(this));
</span><span class="cx"> this._reloadPageIgnoringCacheKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "R", this._reloadPageIgnoringCache.bind(this));
</span><span class="cx">
</span><del>- this._consoleKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Option | WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "C", this.toggleConsoleView.bind(this));
</del><ins>+ this._consoleKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Option | WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "C", this._showConsoleTab.bind(this));
</ins><span class="cx">
</span><span class="cx"> this._inspectModeKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "C", this._toggleInspectMode.bind(this));
</span><span class="cx">
</span><span class="lines">@@ -427,12 +427,8 @@
</span><span class="cx"> WebInspector.contentBrowserTreeElementForRepresentedObject = function(contentBrowser, representedObject)
</span><span class="cx"> {
</span><span class="cx"> // The console does not have a sidebar, so return a tree element here so something is shown.
</span><del>- if (representedObject instanceof WebInspector.LogObject)
</del><ins>+ if (representedObject === this._consoleRepresentedObject)
</ins><span class="cx"> return this._consoleTreeElement;
</span><del>-
- var sidebarPanel = this.sidebarPanelForRepresentedObject(representedObject);
- if (sidebarPanel)
- return sidebarPanel.treeElementForRepresentedObject(representedObject);
</del><span class="cx"> return null;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -575,16 +571,16 @@
</span><span class="cx"> return !this.splitContentBrowser.element.classList.contains("hidden");
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.currentViewSupportsSplitContentBrowser = function()
</del><ins>+WebInspector.doesCurrentTabSupportSplitContentBrowser = function()
</ins><span class="cx"> {
</span><del>- var currentContentView = this.contentBrowser.currentContentView;
</del><ins>+ var currentContentView = this.tabBrowser.selectedTabContentView;
</ins><span class="cx"> return !currentContentView || currentContentView.supportsSplitContentBrowser;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.toggleSplitConsole = function()
</span><span class="cx"> {
</span><del>- if (!this.currentViewSupportsSplitContentBrowser()) {
- this.toggleConsoleView();
</del><ins>+ if (!this.doesCurrentTabSupportSplitContentBrowser()) {
+ this.showConsoleTab();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -596,8 +592,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.showSplitConsole = function()
</span><span class="cx"> {
</span><del>- if (!this.currentViewSupportsSplitContentBrowser()) {
- this.showFullHeightConsole();
</del><ins>+ if (!this.doesCurrentTabSupportSplitContentBrowser()) {
+ this.showConsoleTab();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -606,18 +602,14 @@
</span><span class="cx"> this._showingSplitConsoleSetting.value = true;
</span><span class="cx">
</span><span class="cx"> if (this.splitContentBrowser.currentContentView !== this.consoleContentView) {
</span><del>- var wasShowingFullConsole = this.isShowingConsoleView();
-
- // Be sure to close any existing log view in the main content browser before showing it in the
</del><ins>+ // Be sure to close the view in the tab content browser before showing it in the
</ins><span class="cx"> // split content browser. We can only show a content view in one browser at a time.
</span><del>- this.contentBrowser.contentViewContainer.closeAllContentViewsOfPrototype(WebInspector.LogContentView);
</del><ins>+ if (this.consoleContentView.parentContainer)
+ this.consoleContentView.parentContainer.closeContentView(this.consoleContentView);
</ins><span class="cx"> this.splitContentBrowser.showContentView(this.consoleContentView);
</span><del>-
- if (wasShowingFullConsole && !this.contentBrowser.currentContentView)
- this.resourceSidebarPanel.showDefaultContentView();
</del><span class="cx"> } else {
</span><span class="cx"> // This causes the view to know it was shown and focus the prompt.
</span><del>- this.splitContentBrowser.contentViewContainer.shown();
</del><ins>+ this.splitContentBrowser.shown();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.quickConsole.consoleLogVisibilityChanged(true);
</span><span class="lines">@@ -625,65 +617,42 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.hideSplitConsole = function()
</span><span class="cx"> {
</span><ins>+ if (!this.isShowingSplitConsole())
+ return;
+
</ins><span class="cx"> this.splitContentBrowser.element.classList.add("hidden");
</span><span class="cx">
</span><span class="cx"> this._showingSplitConsoleSetting.value = false;
</span><span class="cx">
</span><span class="cx"> // This causes the view to know it was hidden.
</span><del>- this.splitContentBrowser.contentViewContainer.hidden();
</del><ins>+ this.splitContentBrowser.hidden();
</ins><span class="cx">
</span><span class="cx"> this.quickConsole.consoleLogVisibilityChanged(false);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.showFullHeightConsole = function(requestedScope)
</del><ins>+WebInspector.showConsoleTab = function(requestedScope)
</ins><span class="cx"> {
</span><del>- this.splitContentBrowser.element.classList.add("hidden");
</del><ins>+ this.hideSplitConsole();
</ins><span class="cx">
</span><del>- this._showingSplitConsoleSetting.value = false;
-
</del><span class="cx"> var scope = requestedScope || WebInspector.LogContentView.Scopes.All;
</span><span class="cx">
</span><span class="cx"> // If the requested scope is already selected and the console is showing, then switch back to All.
</span><del>- if (this.isShowingConsoleView() && this.consoleContentView.scopeBar.item(scope).selected)
</del><ins>+ if (this.isShowingConsoleTab() && this.consoleContentView.scopeBar.item(scope).selected)
</ins><span class="cx"> scope = WebInspector.LogContentView.Scopes.All;
</span><span class="cx">
</span><span class="cx"> if (requestedScope || !this.consoleContentView.scopeBar.selectedItems.length)
</span><span class="cx"> this.consoleContentView.scopeBar.item(scope).selected = true;
</span><span class="cx">
</span><del>- if (!this.contentBrowser.currentContentView || this.contentBrowser.currentContentView !== this.consoleContentView) {
- // Be sure to close any existing log view in the split content browser before showing it in the
- // main content browser. We can only show a content view in one browser at a time.
- this.splitContentBrowser.contentViewContainer.closeAllContentViewsOfPrototype(WebInspector.LogContentView);
- this.contentBrowser.showContentView(this.consoleContentView);
- }
</del><ins>+ this.showRepresentedObject(this._consoleRepresentedObject);
</ins><span class="cx">
</span><del>- console.assert(this.isShowingConsoleView());
- console.assert(this._consoleToolbarButton.activated);
-
- this.quickConsole.consoleLogVisibilityChanged(true);
</del><ins>+ console.assert(this.isShowingConsoleTab());
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.isShowingConsoleView = function()
</del><ins>+WebInspector.isShowingConsoleTab = function()
</ins><span class="cx"> {
</span><del>- return this.contentBrowser.currentContentView instanceof WebInspector.LogContentView;
</del><ins>+ return this.tabBrowser.selectedTabContentView instanceof WebInspector.ConsoleTabContentView;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.showConsoleView = function(scope)
-{
- this.showFullHeightConsole(scope);
-};
-
-WebInspector.toggleConsoleView = function()
-{
- if (this.isShowingConsoleView()) {
- if (this.contentBrowser.canGoBack())
- this.contentBrowser.goBack();
- else
- this.resourceSidebarPanel.showDefaultContentView();
- } else
- this.showFullHeightConsole();
-};
-
</del><span class="cx"> WebInspector.UIString = function(string, vararg)
</span><span class="cx"> {
</span><span class="cx"> if (WebInspector.dontLocalizeUserInterface)
</span><span class="lines">@@ -1661,6 +1630,11 @@
</span><span class="cx"> this.domTreeManager.inspectModeEnabled = !this.domTreeManager.inspectModeEnabled;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector._showConsoleTab = function(event)
+{
+ this.showConsoleTab();
+};
+
</ins><span class="cx"> WebInspector._focusedContentView = function()
</span><span class="cx"> {
</span><span class="cx"> if (this.contentBrowser.element.isSelfOrAncestor(this.currentFocusElement))
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesConsolesvg"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Images/Console.svg (0 => 183332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/Console.svg (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/Console.svg 2015-04-26 01:21:38 UTC (rev 183332)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright © 2015 Apple Inc. All rights reserved. -->
+<svg viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect x="0.5" y="0.5" width="15" height="15" rx="2" class="stroked" fill="none" stroke="black"/>
+ <path d="M 4 4 L 8 8 L 4 12" class="stroked" fill="none" stroke="black"/>
+ <path d="M 8 4.5 L 12 4.5" class="stroked" fill="none" stroke="black"/>
+ <path d="M 10 8 L 12 8" class="stroked" fill="none" stroke="black"/>
+ <path d="M 8 11.5 L 12 11.5" class="stroked" fill="none" stroke="black"/>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorFrontendAPIjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js (183331 => 183332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js 2015-04-26 01:20:59 UTC (rev 183331)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js 2015-04-26 01:21:38 UTC (rev 183332)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> showConsole: function()
</span><span class="cx"> {
</span><del>- WebInspector.showConsoleView();
</del><ins>+ WebInspector.showConsoleTab();
</ins><span class="cx">
</span><span class="cx"> WebInspector.quickConsole.prompt.focus();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleTabContentViewjs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleTabContentView.js (0 => 183332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleTabContentView.js (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleTabContentView.js 2015-04-26 01:21:38 UTC (rev 183332)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+WebInspector.ConsoleTabContentView = function(identifier)
+{
+ var tabBarItem = new WebInspector.TabBarItem("Images/Console.svg", WebInspector.UIString("Console"));
+
+ WebInspector.ContentBrowserTabContentView.call(this, identifier || "console", "console", tabBarItem, null, null, true);
+};
+
+WebInspector.ConsoleTabContentView.prototype = {
+ constructor: WebInspector.ConsoleTabContentView,
+ __proto__: WebInspector.ContentBrowserTabContentView.prototype,
+
+ // Public
+
+ get type()
+ {
+ return WebInspector.ConsoleTabContentView.Type;
+ },
+
+ shown: function()
+ {
+ WebInspector.ContentBrowserTabContentView.prototype.shown.call(this);
+
+ if (this.contentBrowser.currentContentView === WebInspector.consoleContentView)
+ return;
+
+ // Be sure to close the view in the split content browser before showing it in the
+ // tab content browser. We can only show a content view in one browser at a time.
+ if (WebInspector.consoleContentView.parentContainer)
+ WebInspector.consoleContentView.parentContainer.closeContentView(WebInspector.consoleContentView);
+
+ this.contentBrowser.showContentView(WebInspector.consoleContentView);
+
+ console.assert(this.contentBrowser.currentContentView === WebInspector.consoleContentView);
+ },
+
+ showRepresentedObject: function(representedObject, cookie)
+ {
+ // Do nothing. The shown function will handle things. Calling
+ // ContentBrowserTabContentView.shown will cause a new LogContentView
+ // to be created instead of reusing WebInspector.consoleContentView.
+ console.assert(representedObject instanceof WebInspector.LogObject);
+ },
+
+ canShowRepresentedObject: function(representedObject)
+ {
+ return representedObject instanceof WebInspector.LogObject;
+ },
+
+ get supportsSplitContentBrowser()
+ {
+ return false;
+ }
+};
+
+WebInspector.ConsoleTabContentView.Type = "console";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDefaultDashboardViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js (183331 => 183332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js 2015-04-26 01:20:59 UTC (rev 183331)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js 2015-04-26 01:21:38 UTC (rev 183332)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx">
</span><span class="cx"> _consoleItemWasClicked(scope)
</span><span class="cx"> {
</span><del>- WebInspector.showConsoleView(scope);
</del><ins>+ WebInspector.showConsoleTab(scope);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _setConsoleItemValue(itemName, newValue)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (183331 => 183332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-04-26 01:20:59 UTC (rev 183331)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-04-26 01:21:38 UTC (rev 183332)
</span><span class="lines">@@ -79,13 +79,10 @@
</span><span class="cx">
</span><span class="cx"> this._clearLogOnReloadSetting = new WebInspector.Setting("clear-log-on-reload", true);
</span><span class="cx">
</span><del>- var toolTip = WebInspector.UIString("Show split console");
- var altToolTip = WebInspector.UIString("Show full-height console");
</del><ins>+ var toolTip = WebInspector.UIString("Show console tab");
+ this._showConsoleTabNavigationItem = new WebInspector.ButtonNavigationItem("show-tab", toolTip, platformImagePath("SplitToggleUp.svg"), 16, 16);
+ this._showConsoleTabNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._showConsoleTab, this);
</ins><span class="cx">
</span><del>- this._toggleSplitNavigationItem = new WebInspector.ToggleButtonNavigationItem("split-toggle", toolTip, altToolTip, platformImagePath("SplitToggleDown.svg"), platformImagePath("SplitToggleUp.svg"), 16, 16);
- this._toggleSplitNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._toggleSplit, this);
- this._toggleSplitNavigationItem.toggled = WebInspector.isShowingSplitConsole();
-
</del><span class="cx"> this.messagesElement.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this), false);
</span><span class="cx">
</span><span class="cx"> WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.Cleared, this._sessionsCleared, this);
</span><span class="lines">@@ -118,7 +115,10 @@
</span><span class="cx">
</span><span class="cx"> get navigationItems()
</span><span class="cx"> {
</span><del>- return [this._searchBar, this._scopeBar, this._clearLogNavigationItem, this._toggleSplitNavigationItem];
</del><ins>+ var navigationItems = [this._searchBar, this._scopeBar, this._clearLogNavigationItem];
+ if (WebInspector.isShowingSplitConsole())
+ navigationItems.push(this._showConsoleTabNavigationItem);
+ return navigationItems;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> get scopeBar()
</span><span class="lines">@@ -140,8 +140,6 @@
</span><span class="cx">
</span><span class="cx"> shown: function()
</span><span class="cx"> {
</span><del>- this._toggleSplitNavigationItem.toggled = WebInspector.isShowingSplitConsole();
-
</del><span class="cx"> this.prompt.focus();
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -204,7 +202,7 @@
</span><span class="cx"> if (type !== WebInspector.ConsoleMessage.MessageType.Result)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!WebInspector.isShowingConsoleView())
</del><ins>+ if (!WebInspector.isShowingConsoleTab())
</ins><span class="cx"> WebInspector.showSplitConsole();
</span><span class="cx">
</span><span class="cx"> this._logViewController.scrollToBottom();
</span><span class="lines">@@ -639,12 +637,9 @@
</span><span class="cx"> this._ignoreDidClearMessages = false;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _toggleSplit: function()
</del><ins>+ _showConsoleTab: function()
</ins><span class="cx"> {
</span><del>- if (WebInspector.isShowingSplitConsole())
- WebInspector.showFullHeightConsole();
- else
- WebInspector.showSplitConsole();
</del><ins>+ WebInspector.showConsoleTab();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _toggleClearLogOnReloadSetting: function()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLogIconcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogIcon.css (183331 => 183332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LogIcon.css 2015-04-26 01:20:59 UTC (rev 183331)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogIcon.css 2015-04-26 01:21:38 UTC (rev 183332)
</span><span class="lines">@@ -24,5 +24,5 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> .log-icon .icon {
</span><del>- content: -webkit-image-set(url(../Images/Log.png) 1x, url(../Images/Log@2x.png) 2x);
</del><ins>+ content: url(../Images/Console.svg);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsMaincss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Main.css (183331 => 183332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Main.css 2015-04-26 01:20:59 UTC (rev 183331)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Main.css 2015-04-26 01:21:38 UTC (rev 183332)
</span><span class="lines">@@ -174,6 +174,20 @@
</span><span class="cx"> cursor: default;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#split-content-browser .hierarchical-path-component.log-icon .icon {
+ margin-left: 6px;
+ margin-right: 6px;
+ opacity: 0.7;
+}
+
+#split-content-browser .hierarchical-path-component.log-icon .title {
+ color: rgba(0, 0, 0, 0.75);
+}
+
+#split-content-browser .hierarchical-path-component.log-icon select {
+ display: none;
+}
+
</ins><span class="cx"> #details-sidebar {
</span><span class="cx"> width: 300px;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>