<!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>[211064] 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/211064">211064</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-23 15:06:26 -0800 (Mon, 23 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: long press on New Tab Tab Item should show context menu with recently closed tabs that are still closed
https://bugs.webkit.org/show_bug.cgi?id=166901
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2017-01-23
Reviewed by Joseph Pecoraro.
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Views/TabBar.js:
(WebInspector.TabBar.Event):
(WebInspector.TabBar.prototype._handleNewTabContextMenu):
Add listener dispatch for contextmenu event on New Tab tab item.
(WebInspector.TabBar.prototype.get newTabTabBarItem): Deleted.
Unused.
* UserInterface/Views/TabBrowser.js:
(WebInspector.TabBrowser):
(WebInspector.TabBrowser.prototype._tabBarItemAdded):
(WebInspector.TabBrowser.prototype._tabBarItemRemoved):
(WebInspector.TabBrowser.prototype._handleNewTabContextMenu): Added.
Create an array that keeps track of tabs as they are closed, and populate the contextmenu
of the New Tab tab item with entries for each of these tabs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTabBarjs">trunk/Source/WebInspectorUI/UserInterface/Views/TabBar.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTabBrowserjs">trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (211063 => 211064)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-01-23 22:49:26 UTC (rev 211063)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-01-23 23:06:26 UTC (rev 211064)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2017-01-23 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><ins>+ Web Inspector: long press on New Tab Tab Item should show context menu with recently closed tabs that are still closed
+ https://bugs.webkit.org/show_bug.cgi?id=166901
+
+ Reviewed by Joseph Pecoraro.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Views/TabBar.js:
+ (WebInspector.TabBar.Event):
+ (WebInspector.TabBar.prototype._handleNewTabContextMenu):
+ Add listener dispatch for contextmenu event on New Tab tab item.
+
+ (WebInspector.TabBar.prototype.get newTabTabBarItem): Deleted.
+ Unused.
+
+ * UserInterface/Views/TabBrowser.js:
+ (WebInspector.TabBrowser):
+ (WebInspector.TabBrowser.prototype._tabBarItemAdded):
+ (WebInspector.TabBrowser.prototype._tabBarItemRemoved):
+ (WebInspector.TabBrowser.prototype._handleNewTabContextMenu): Added.
+ Create an array that keeps track of tabs as they are closed, and populate the contextmenu
+ of the New Tab tab item with entries for each of these tabs.
+
+2017-01-23 Devin Rousso <dcrousso+webkit@gmail.com>
+
</ins><span class="cx"> Web Inspector: tree elements with depth > 1 should have context menu "expand all"/"collapse all" commands
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135590
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (211063 => 211064)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-01-23 22:49:26 UTC (rev 211063)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-01-23 23:06:26 UTC (rev 211064)
</span><span class="lines">@@ -609,6 +609,7 @@
</span><span class="cx"> localizedStrings["Range Issue"] = "Range Issue";
</span><span class="cx"> localizedStrings["Readonly"] = "Readonly";
</span><span class="cx"> localizedStrings["Reasons for compositing:"] = "Reasons for compositing:";
</span><ins>+localizedStrings["Recently Closed Tabs"] = "Recently Closed Tabs";
</ins><span class="cx"> localizedStrings["Recording Timeline Data"] = "Recording Timeline Data";
</span><span class="cx"> localizedStrings["Reference Issue"] = "Reference Issue";
</span><span class="cx"> localizedStrings["Reflection"] = "Reflection";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTabBarjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabBar.js (211063 => 211064)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TabBar.js 2017-01-23 22:49:26 UTC (rev 211063)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabBar.js 2017-01-23 23:06:26 UTC (rev 211064)
</span><span class="lines">@@ -49,13 +49,12 @@
</span><span class="cx"> this._newTabTabBarItem = new WebInspector.PinnedTabBarItem("Images/NewTabPlus.svg", WebInspector.UIString("Create a new tab"));
</span><span class="cx"> this._newTabTabBarItem.element.addEventListener("mouseenter", this._handleNewTabMouseEnter.bind(this));
</span><span class="cx"> this._newTabTabBarItem.element.addEventListener("click", this._handleNewTabClick.bind(this));
</span><ins>+ this._newTabTabBarItem.element.addEventListener("contextmenu", this._handleNewTabContextMenu.bind(this));
</ins><span class="cx"> this.addTabBarItem(this._newTabTabBarItem, true);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><del>- get newTabTabBarItem() { return this._newTabTabBarItem; }
-
</del><span class="cx"> updateNewTabTabBarItemState()
</span><span class="cx"> {
</span><span class="cx"> let newTabExists = !WebInspector.isNewTabWithTypeAllowed(WebInspector.NewTabContentView.Type);
</span><span class="lines">@@ -730,6 +729,13 @@
</span><span class="cx"> WebInspector.showNewTabTab(shouldAnimate);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _handleNewTabContextMenu(event)
+ {
+ let contextMenu = WebInspector.ContextMenu.createFromEvent(event);
+
+ this.dispatchEventToListeners(WebInspector.TabBar.Event.NewTabContextMenu, {contextMenu});
+ }
+
</ins><span class="cx"> _handleNewTabMouseEnter(event)
</span><span class="cx"> {
</span><span class="cx"> if (!this._tabAnimatedClosedSinceMouseEnter || !this.element.classList.contains("static-layout") || this.element.classList.contains("animating"))
</span><span class="lines">@@ -744,5 +750,6 @@
</span><span class="cx"> TabBarItemAdded: "tab-bar-tab-bar-item-added",
</span><span class="cx"> TabBarItemRemoved: "tab-bar-tab-bar-item-removed",
</span><span class="cx"> TabBarItemsReordered: "tab-bar-tab-bar-items-reordered",
</span><ins>+ NewTabContextMenu: "tab-bar-new-tab-contextmenu",
</ins><span class="cx"> OpenDefaultTab: "tab-bar-open-default-tab"
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTabBrowserjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js (211063 => 211064)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js 2017-01-23 22:49:26 UTC (rev 211063)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js 2017-01-23 23:06:26 UTC (rev 211064)
</span><span class="lines">@@ -72,9 +72,12 @@
</span><span class="cx"> this._showPreviousTabKeyboardShortcut3.implicitlyPreventsDefault = false;
</span><span class="cx">
</span><span class="cx"> this._tabBar.addEventListener(WebInspector.TabBar.Event.TabBarItemSelected, this._tabBarItemSelected, this);
</span><ins>+ this._tabBar.addEventListener(WebInspector.TabBar.Event.TabBarItemAdded, this._tabBarItemAdded, this);
</ins><span class="cx"> this._tabBar.addEventListener(WebInspector.TabBar.Event.TabBarItemRemoved, this._tabBarItemRemoved, this);
</span><ins>+ this._tabBar.addEventListener(WebInspector.TabBar.Event.NewTabContextMenu, this._handleNewTabContextMenu, this);
</ins><span class="cx">
</span><span class="cx"> this._recentTabContentViews = [];
</span><ins>+ this._closedTabClasses = new Set;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="lines">@@ -246,6 +249,17 @@
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.TabBrowser.Event.SelectedTabContentViewDidChange);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _tabBarItemAdded(event)
+ {
+ let tabContentView = event.data.tabBarItem.representedObject;
+
+ console.assert(tabContentView);
+ if (!tabContentView)
+ return;
+
+ this._closedTabClasses.delete(tabContentView.constructor);
+ }
+
</ins><span class="cx"> _tabBarItemRemoved(event)
</span><span class="cx"> {
</span><span class="cx"> let tabContentView = event.data.tabBarItem.representedObject;
</span><span class="lines">@@ -255,6 +269,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._recentTabContentViews.remove(tabContentView);
</span><ins>+
+ if (!tabContentView.constructor.isEphemeral())
+ this._closedTabClasses.add(tabContentView.constructor);
+
</ins><span class="cx"> this._contentViewContainer.closeContentView(tabContentView);
</span><span class="cx">
</span><span class="cx"> tabContentView.parentTabBrowser = null;
</span><span class="lines">@@ -263,6 +281,35 @@
</span><span class="cx"> console.assert(!this.selectedTabContentView || this.selectedTabContentView === this._recentTabContentViews[0]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _handleNewTabContextMenu(event)
+ {
+ // The array must be reversed because Sets insert into the end, and we want to display the
+ // most recently closed item first (which is the last item added to the set).
+ let closedTabClasses = Array.from(this._closedTabClasses).reverse();
+ let allTabClasses = Array.from(WebInspector.knownTabClasses());
+ let tabClassesToDisplay = closedTabClasses.concat(allTabClasses.filter((tabClass) => {
+ if (closedTabClasses.includes(tabClass))
+ return false;
+
+ if (tabClass.isEphemeral())
+ return false;
+
+ return WebInspector.isNewTabWithTypeAllowed(tabClass.Type);
+ }));
+ if (!tabClassesToDisplay.length)
+ return;
+
+ let contextMenu = event.data.contextMenu;
+
+ contextMenu.appendItem(WebInspector.UIString("Recently Closed Tabs"), null, true);
+
+ for (let tabClass of tabClassesToDisplay) {
+ contextMenu.appendItem(tabClass.tabInfo().title, () => {
+ WebInspector.createNewTabWithType(tabClass.Type, {shouldShowNewTab: true});
+ });
+ }
+ }
+
</ins><span class="cx"> _sidebarPanelSelected(event)
</span><span class="cx"> {
</span><span class="cx"> if (this._ignoreSidebarEvents)
</span></span></pre>
</div>
</div>
</body>
</html>