<!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>[183324] 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/183324">183324</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-04-25 18:16:50 -0700 (Sat, 25 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Disable global keyboard shortcuts for background tabs
https://bugs.webkit.org/show_bug.cgi?id=143918
Reviewed by Joseph Pecoraro.
* UserInterface/Views/ContentBrowser.js:
(WebInspector.ContentBrowser):
(WebInspector.ContentBrowser.prototype.shown): Added.
(WebInspector.ContentBrowser.prototype.hidden): Added.
Disable shortcuts on the browser and find banner.
* UserInterface/Views/ContentBrowserTabContentView.js:
(WebInspector.ContentBrowserTabContentView.prototype.shown): Added.
(WebInspector.ContentBrowserTabContentView.prototype.hidden): Added.
Tell the content browser we were shown or hidden.
* UserInterface/Views/FindBanner.js:
(WebInspector.FindBanner):
(WebInspector.FindBanner.prototype.show):
(WebInspector.FindBanner.prototype.enableKeyboardShortcuts): Added.
(WebInspector.FindBanner.prototype.disableKeyboardShortcuts): Added.
Support disabling or enabling the keyboard shortcuts.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFindBannerjs">trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (183323 => 183324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:16:22 UTC (rev 183323)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:16:50 UTC (rev 183324)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-04-18 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Disable global keyboard shortcuts for background tabs
+ https://bugs.webkit.org/show_bug.cgi?id=143918
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/ContentBrowser.js:
+ (WebInspector.ContentBrowser):
+ (WebInspector.ContentBrowser.prototype.shown): Added.
+ (WebInspector.ContentBrowser.prototype.hidden): Added.
+ Disable shortcuts on the browser and find banner.
+
+ * UserInterface/Views/ContentBrowserTabContentView.js:
+ (WebInspector.ContentBrowserTabContentView.prototype.shown): Added.
+ (WebInspector.ContentBrowserTabContentView.prototype.hidden): Added.
+ Tell the content browser we were shown or hidden.
+
+ * UserInterface/Views/FindBanner.js:
+ (WebInspector.FindBanner):
+ (WebInspector.FindBanner.prototype.show):
+ (WebInspector.FindBanner.prototype.enableKeyboardShortcuts): Added.
+ (WebInspector.FindBanner.prototype.disableKeyboardShortcuts): Added.
+ Support disabling or enabling the keyboard shortcuts.
+
</ins><span class="cx"> 2015-04-17 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Add TabBrowser and TabContentView
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js (183323 => 183324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2015-04-26 01:16:22 UTC (rev 183323)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2015-04-26 01:16:50 UTC (rev 183324)
</span><span class="lines">@@ -39,17 +39,24 @@
</span><span class="cx"> this._element.appendChild(this._contentViewContainer.element);
</span><span class="cx">
</span><span class="cx"> this._findBanner = new WebInspector.FindBanner(this);
</span><del>- this._findKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "F", this._showFindBanner.bind(this));
</del><span class="cx"> this._findBanner.addEventListener(WebInspector.FindBanner.Event.DidShow, this._findBannerDidShow, this);
</span><span class="cx"> this._findBanner.addEventListener(WebInspector.FindBanner.Event.DidHide, this._findBannerDidHide, this);
</span><span class="cx">
</span><ins>+ this._findKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "F", this._showFindBanner.bind(this));
</ins><span class="cx"> this._saveKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "S", this._save.bind(this));
</span><span class="cx"> this._saveAsKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Shift | WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "S", this._saveAs.bind(this));
</span><span class="cx">
</span><ins>+ this._findKeyboardShortcut.disabled = true;
+ this._saveKeyboardShortcut.disabled = true;
+ this._saveAsKeyboardShortcut.disabled = true;
+
</ins><span class="cx"> if (!disableBackForward) {
</span><span class="cx"> this._backKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Control, WebInspector.KeyboardShortcut.Key.Left, this._backButtonClicked.bind(this));
</span><span class="cx"> this._forwardKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Control, WebInspector.KeyboardShortcut.Key.Right, this._forwardButtonClicked.bind(this));
</span><span class="cx">
</span><ins>+ this._backKeyboardShortcut.disabled = true;
+ this._forwardKeyboardShortcut.disabled = true;
+
</ins><span class="cx"> var forwardArrow, backArrow;
</span><span class="cx"> if (WebInspector.Platform.isLegacyMacOS) {
</span><span class="cx"> forwardArrow = {src: "Images/Legacy/ForwardArrow.svg", width: 9, height: 9};
</span><span class="lines">@@ -271,6 +278,38 @@
</span><span class="cx"> currentContentView.revealNextSearchResult(!findBanner.showing);
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ shown: function()
+ {
+ this._contentViewContainer.shown();
+
+ if (this._backKeyboardShortcut)
+ this._backKeyboardShortcut.disabled = false;
+ if (this._forwardKeyboardShortcut)
+ this._forwardKeyboardShortcut.disabled = false;
+
+ this._findKeyboardShortcut.disabled = false;
+ this._saveKeyboardShortcut.disabled = false;
+ this._saveAsKeyboardShortcut.disabled = false;
+
+ this._findBanner.enableKeyboardShortcuts();
+ },
+
+ hidden: function()
+ {
+ this._contentViewContainer.hidden();
+
+ if (this._backKeyboardShortcut)
+ this._backKeyboardShortcut.disabled = false;
+ if (this._forwardKeyboardShortcut)
+ this._forwardKeyboardShortcut.disabled = true;
+
+ this._findKeyboardShortcut.disabled = true;
+ this._saveKeyboardShortcut.disabled = true;
+ this._saveAsKeyboardShortcut.disabled = true;
+
+ this._findBanner.disableKeyboardShortcuts();
+ },
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _backButtonClicked: function(event)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js (183323 => 183324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js 2015-04-26 01:16:22 UTC (rev 183323)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js 2015-04-26 01:16:50 UTC (rev 183324)
</span><span class="lines">@@ -91,10 +91,19 @@
</span><span class="cx"> {
</span><span class="cx"> WebInspector.TabContentView.prototype.shown.call(this);
</span><span class="cx">
</span><ins>+ this._contentBrowser.shown();
+
</ins><span class="cx"> if (this.navigationSidebarPanel && !this._contentBrowser.currentContentView)
</span><span class="cx"> this.navigationSidebarPanel.showDefaultContentView();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ hidden: function()
+ {
+ WebInspector.TabContentView.prototype.hidden.call(this);
+
+ this._contentBrowser.hidden();
+ },
+
</ins><span class="cx"> closed: function()
</span><span class="cx"> {
</span><span class="cx"> WebInspector.TabContentView.prototype.closed.call(this);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFindBannerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js (183323 => 183324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js 2015-04-26 01:16:22 UTC (rev 183323)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js 2015-04-26 01:16:50 UTC (rev 183324)
</span><span class="lines">@@ -86,6 +86,8 @@
</span><span class="cx"> this._findNextKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "G", this._nextResultButtonClicked.bind(this));
</span><span class="cx"> this._findPreviousKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Shift | WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "G", this._previousResultButtonClicked.bind(this));
</span><span class="cx">
</span><ins>+ this.disableKeyboardShortcuts();
+
</ins><span class="cx"> this._generateButtonsGlyphsIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -205,7 +207,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Delay adding the classes in case the target element and/or the find banner were just added to
</span><del>- // the document. Adding the class right away will prevent the animation from working the firs time.
</del><ins>+ // the document. Adding the class right away will prevent the animation from working the first time.
</ins><span class="cx"> setTimeout(delayedWork.bind(this), 0);
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.FindBanner.Event.DidShow);
</span><span class="lines">@@ -225,6 +227,20 @@
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.FindBanner.Event.DidHide);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ enableKeyboardShortcuts()
+ {
+ this._populateFindKeyboardShortcut.disabled = false;
+ this._findNextKeyboardShortcut.disabled = false;
+ this._findPreviousKeyboardShortcut.disabled = false;
+ }
+
+ disableKeyboardShortcuts()
+ {
+ this._populateFindKeyboardShortcut.disabled = true;
+ this._findNextKeyboardShortcut.disabled = true;
+ this._findPreviousKeyboardShortcut.disabled = true;
+ }
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _inputFieldKeyDown(event)
</span></span></pre>
</div>
</div>
</body>
</html>