<!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>[189828] 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/189828">189828</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2015-09-15 16:44:30 -0700 (Tue, 15 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: command-click in NewTabContentView should open new tab without switching to it
https://bugs.webkit.org/show_bug.cgi?id=149173
Reviewed by Joseph Pecoraro.
To allow a user to quickly restore tabs, it should be possible to command-click
all the tabs that are desired without going back through the [+] tab button.
* UserInterface/Base/Main.js:
(WebInspector.createNewTabWithType): Renamed.
Use an options object and split creating the tab from deleting the
replaced tab and showing the new tab. Add better error checking.
(WebInspector.createNewTab): Deleted.
* UserInterface/Views/NewTabContentView.js:
(WebInspector.NewTabContentView):
(WebInspector.NewTabContentView.prototype._createNewTabWithType): Renamed.
If the meta key is pressed, don't switch to the new tab or remove this view
unless there are no more tabs that can be created beyond the current one.
(WebInspector.NewTabContentView.prototype._allowableTabTypes): Added.
(WebInspector.NewTabContentView.prototype._createNewTab): Deleted.</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="#trunkSourceWebInspectorUIUserInterfaceViewsNewTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NewTabContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (189827 => 189828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-09-15 22:10:54 UTC (rev 189827)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-09-15 23:44:30 UTC (rev 189828)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-09-15 Brian Burg <bburg@apple.com>
+
+ Web Inspector: command-click in NewTabContentView should open new tab without switching to it
+ https://bugs.webkit.org/show_bug.cgi?id=149173
+
+ Reviewed by Joseph Pecoraro.
+
+ To allow a user to quickly restore tabs, it should be possible to command-click
+ all the tabs that are desired without going back through the [+] tab button.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.createNewTabWithType): Renamed.
+
+ Use an options object and split creating the tab from deleting the
+ replaced tab and showing the new tab. Add better error checking.
+
+ (WebInspector.createNewTab): Deleted.
+ * UserInterface/Views/NewTabContentView.js:
+ (WebInspector.NewTabContentView):
+ (WebInspector.NewTabContentView.prototype._createNewTabWithType): Renamed.
+
+ If the meta key is pressed, don't switch to the new tab or remove this view
+ unless there are no more tabs that can be created beyond the current one.
+
+ (WebInspector.NewTabContentView.prototype._allowableTabTypes): Added.
+ (WebInspector.NewTabContentView.prototype._createNewTab): Deleted.
+
</ins><span class="cx"> 2015-09-15 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Watch Expressions uncaught exceptions on page reload
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (189827 => 189828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-09-15 22:10:54 UTC (rev 189827)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-09-15 23:44:30 UTC (rev 189828)
</span><span class="lines">@@ -507,20 +507,24 @@
</span><span class="cx"> return true;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.createNewTab = function(tabType, newTabContentViewToReplace)
</del><ins>+WebInspector.createNewTabWithType = function(tabType, options = {})
</ins><span class="cx"> {
</span><span class="cx"> console.assert(this.isNewTabWithTypeAllowed(tabType));
</span><span class="cx">
</span><del>- var tabContentView = this._tabContentViewForType(tabType);
</del><ins>+ let {referencedView, shouldReplaceTab, shouldShowNewTab} = options;
+ console.assert(!referencedView || referencedView instanceof WebInspector.TabContentView, referencedView);
+ console.assert(!shouldReplaceTab || referencedView, "Must provide a reference view to replace a tab.");
</ins><span class="cx">
</span><del>- if (newTabContentViewToReplace) {
- var insertionIndex = this.tabBar.tabBarItems.indexOf(newTabContentViewToReplace.tabBarItem);
- this.tabBrowser.closeTabForContentView(newTabContentViewToReplace, true);
- this.tabBrowser.showTabForContentView(tabContentView, true, insertionIndex);
- return;
- }
</del><ins>+ let tabContentView = this._tabContentViewForType(tabType);
+ const suppressAnimations = true;
+ let insertionIndex = referencedView ? this.tabBar.tabBarItems.indexOf(referencedView.tabBarItem) : undefined;
+ this.tabBrowser.addTabForContentView(tabContentView, suppressAnimations, insertionIndex);
</ins><span class="cx">
</span><del>- this.tabBrowser.showTabForContentView(tabContentView);
</del><ins>+ if (shouldReplaceTab)
+ this.tabBrowser.closeTabForContentView(referencedView, suppressAnimations);
+
+ if (shouldShowNewTab)
+ this.tabBrowser.showTabForContentView(tabContentView);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.activateExtraDomains = function(domains)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNewTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NewTabContentView.js (189827 => 189828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NewTabContentView.js 2015-09-15 22:10:54 UTC (rev 189827)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NewTabContentView.js 2015-09-15 23:44:30 UTC (rev 189828)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> var tabItemElement = document.createElement("div");
</span><span class="cx"> tabItemElement.classList.add(WebInspector.NewTabContentView.TabItemStyleClassName);
</span><del>- tabItemElement.addEventListener("click", this._createNewTab.bind(this, info.type));
</del><ins>+ tabItemElement.addEventListener("click", this._createNewTabWithType.bind(this, info.type));
</ins><span class="cx"> tabItemElement[WebInspector.NewTabContentView.TypeSymbol] = info.type;
</span><span class="cx">
</span><span class="cx"> var boxElement = tabItemElement.appendChild(document.createElement("div"));
</span><span class="lines">@@ -93,22 +93,40 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get tabItemElements()
+ {
+ return Array.from(this.element.querySelectorAll("." + WebInspector.NewTabContentView.TabItemStyleClassName));
+ }
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><del>- _createNewTab(tabType, event)
</del><ins>+ _createNewTabWithType(tabType, event)
</ins><span class="cx"> {
</span><span class="cx"> if (!WebInspector.isNewTabWithTypeAllowed(tabType))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebInspector.createNewTab(tabType, this);
</del><ins>+ const canCreateAdditionalTabs = this._allowableTabTypes().length > 1;
+ const options = {
+ referencedView: this,
+ shouldReplaceTab: !canCreateAdditionalTabs || !WebInspector.modifierKeys.metaKey,
+ shouldShowNewTab: !WebInspector.modifierKeys.metaKey
+ }
+ WebInspector.createNewTabWithType(tabType, options);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ _allowableTabTypes()
+ {
+ let tabItemElements = this.tabItemElements;
+ let tabTypes = tabItemElements.map((tabItemElement) => tabItemElement[WebInspector.NewTabContentView.TypeSymbol]);
+ return tabTypes.filter((type) => WebInspector.isNewTabWithTypeAllowed(type));
+ }
+
</ins><span class="cx"> _updateTabItems()
</span><span class="cx"> {
</span><del>- var tabItemElements = Array.from(this.element.querySelectorAll("." + WebInspector.NewTabContentView.TabItemStyleClassName));
- for (var tabItemElement of tabItemElements) {
- var type = tabItemElement[WebInspector.NewTabContentView.TypeSymbol];
- var allowed = WebInspector.isNewTabWithTypeAllowed(type);
</del><ins>+ let tabItemElements = this.tabItemElements;
+ for (let tabItemElement of tabItemElements) {
+ let type = tabItemElement[WebInspector.NewTabContentView.TypeSymbol];
+ let allowed = WebInspector.isNewTabWithTypeAllowed(type);
</ins><span class="cx"> tabItemElement.classList.toggle(WebInspector.NewTabContentView.DisabledStyleClassName, !allowed);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>