<!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>[205413] 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/205413">205413</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-03 17:27:40 -0700 (Sat, 03 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Add keyboard shortcut for switching to last used dock configuration
https://bugs.webkit.org/show_bug.cgi?id=110328
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2016-09-03
Reviewed by Brian Burg.
* UserInterface/Base/Main.js:
(WebInspector.contentLoaded):
(WebInspector.updateDockedState):
(WebInspector._togglePreviousDockConfiguration):
Added variable for saving the previous dock state, which is used by the new Cmd+Shift+D
shortcut to toggle the docked state between the current and previous states.
(WebInspector._undock):
(WebInspector._dockBottom):
(WebInspector._dockRight):
(WebInspector._updateDockNavigationItems):
(WebInspector._dockedResizerMouseDown):
(WebInspector._dockedResizerMouseDown.dockedResizerDrag):
Make use of new WebInspector.DockConfiguration instead of hardcoded strings.
(WebInspector.DockConfiguration):
Create enum for different WebInspector dock modes:
- Right
- Bottom
- Undocked</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (205412 => 205413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2016-09-04 00:24:14 UTC (rev 205412)
+++ trunk/Source/WebInspectorUI/ChangeLog        2016-09-04 00:27:40 UTC (rev 205413)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-09-03 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Web Inspector: Add keyboard shortcut for switching to last used dock configuration
+ https://bugs.webkit.org/show_bug.cgi?id=110328
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.contentLoaded):
+ (WebInspector.updateDockedState):
+ (WebInspector._togglePreviousDockConfiguration):
+ Added variable for saving the previous dock state, which is used by the new Cmd+Shift+D
+ shortcut to toggle the docked state between the current and previous states.
+
+ (WebInspector._undock):
+ (WebInspector._dockBottom):
+ (WebInspector._dockRight):
+ (WebInspector._updateDockNavigationItems):
+ (WebInspector._dockedResizerMouseDown):
+ (WebInspector._dockedResizerMouseDown.dockedResizerDrag):
+ Make use of new WebInspector.DockConfiguration instead of hardcoded strings.
+
+ (WebInspector.DockConfiguration):
+ Create enum for different WebInspector dock modes:
+ - Right
+ - Bottom
+ - Undocked
+
</ins><span class="cx"> 2016-09-03 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Address ESLint undefined variable errors
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (205412 => 205413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js        2016-09-04 00:24:14 UTC (rev 205412)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js        2016-09-04 00:27:40 UTC (rev 205413)
</span><span class="lines">@@ -316,6 +316,8 @@
</span><span class="cx"> this._dockBottomToolbarButton = new WebInspector.ButtonToolbarItem("dock-bottom", WebInspector.UIString("Dock to bottom of window"), null, "Images/DockBottom.svg");
</span><span class="cx"> this._dockBottomToolbarButton.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._dockBottom, this);
</span><span class="cx">
</span><ins>+ this._togglePreviousDockConfigurationKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "D", this._togglePreviousDockConfiguration.bind(this));
+
</ins><span class="cx"> var toolTip;
</span><span class="cx"> if (WebInspector.debuggableType === WebInspector.DebuggableType.JavaScript)
</span><span class="cx"> toolTip = WebInspector.UIString("Restart (%s)").format(this._reloadPageKeyboardShortcut.displayName);
</span><span class="lines">@@ -699,23 +701,31 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.updateDockedState = function(side)
</span><span class="cx"> {
</span><del>- if (this._dockSide === side)
</del><ins>+ if (this._dockConfiguration === side)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- this._dockSide = side;
</del><ins>+ this._previousDockConfiguration = this._dockConfiguration;
+ if (!this._previousDockConfiguration) {
+ if (side === WebInspector.DockConfiguration.Right)
+ this._previousDockConfiguration = WebInspector.DockConfiguration.Bottom;
+ else
+ this._previousDockConfiguration = WebInspector.DockConfiguration.Right;
+ }
</ins><span class="cx">
</span><del>- this.docked = side !== "undocked";
</del><ins>+ this._dockConfiguration = side;
</ins><span class="cx">
</span><ins>+ this.docked = side !== WebInspector.DockConfiguration.Undocked;
+
</ins><span class="cx"> this._ignoreToolbarModeDidChangeEvents = true;
</span><span class="cx">
</span><del>- if (side === "bottom") {
- document.body.classList.add("docked", "bottom");
- document.body.classList.remove("window-inactive", "right");
- } else if (side === "right") {
- document.body.classList.add("docked", "right");
- document.body.classList.remove("window-inactive", "bottom");
</del><ins>+ if (side === WebInspector.DockConfiguration.Bottom) {
+ document.body.classList.add("docked", WebInspector.DockConfiguration.Bottom);
+ document.body.classList.remove("window-inactive", WebInspector.DockConfiguration.Right);
+ } else if (side === WebInspector.DockConfiguration.Right) {
+ document.body.classList.add("docked", WebInspector.DockConfiguration.Right);
+ document.body.classList.remove("window-inactive", WebInspector.DockConfiguration.Bottom);
</ins><span class="cx"> } else
</span><del>- document.body.classList.remove("docked", "right", "bottom");
</del><ins>+ document.body.classList.remove("docked", WebInspector.DockConfiguration.Right, WebInspector.DockConfiguration.Bottom);
</ins><span class="cx">
</span><span class="cx"> this._ignoreToolbarModeDidChangeEvents = false;
</span><span class="cx">
</span><span class="lines">@@ -1479,26 +1489,31 @@
</span><span class="cx">
</span><span class="cx"> WebInspector._undock = function(event)
</span><span class="cx"> {
</span><del>- InspectorFrontendHost.requestSetDockSide("undocked");
</del><ins>+ InspectorFrontendHost.requestSetDockSide(WebInspector.DockConfiguration.Undocked);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector._dockBottom = function(event)
</span><span class="cx"> {
</span><del>- InspectorFrontendHost.requestSetDockSide("bottom");
</del><ins>+ InspectorFrontendHost.requestSetDockSide(WebInspector.DockConfiguration.Bottom);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector._dockRight = function(event)
</span><span class="cx"> {
</span><del>- InspectorFrontendHost.requestSetDockSide("right");
</del><ins>+ InspectorFrontendHost.requestSetDockSide(WebInspector.DockConfiguration.Right);
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector._togglePreviousDockConfiguration = function(event)
+{
+ InspectorFrontendHost.requestSetDockSide(this._previousDockConfiguration);
+};
+
</ins><span class="cx"> WebInspector._updateDockNavigationItems = function()
</span><span class="cx"> {
</span><span class="cx"> if (this._dockingAvailable || this.docked) {
</span><span class="cx"> this._closeToolbarButton.hidden = !this.docked;
</span><del>- this._undockToolbarButton.hidden = this._dockSide === "undocked";
- this._dockBottomToolbarButton.hidden = this._dockSide === "bottom";
- this._dockRightToolbarButton.hidden = this._dockSide === "right";
</del><ins>+ this._undockToolbarButton.hidden = this._dockConfiguration === WebInspector.DockConfiguration.Undocked;
+ this._dockBottomToolbarButton.hidden = this._dockConfiguration === WebInspector.DockConfiguration.Bottom;
+ this._dockRightToolbarButton.hidden = this._dockConfiguration === WebInspector.DockConfiguration.Right;
</ins><span class="cx"> } else {
</span><span class="cx"> this._closeToolbarButton.hidden = true;
</span><span class="cx"> this._undockToolbarButton.hidden = true;
</span><span class="lines">@@ -1621,7 +1636,7 @@
</span><span class="cx"> if (event.ctrlKey)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (this._dockSide === "right")
</del><ins>+ if (this._dockConfiguration === WebInspector.DockConfiguration.Right)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (this.docked)
</span><span class="lines">@@ -1643,9 +1658,9 @@
</span><span class="cx"> !event.target.classList.contains("flexible-space") && !event.target.classList.contains("item-section"))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var windowProperty = this._dockSide === "bottom" ? "innerHeight" : "innerWidth";
- var eventScreenProperty = this._dockSide === "bottom" ? "screenY" : "screenX";
- var eventClientProperty = this._dockSide === "bottom" ? "clientY" : "clientX";
</del><ins>+ let windowProperty = this._dockConfiguration === WebInspector.DockConfiguration.Bottom ? "innerHeight" : "innerWidth";
+ let eventScreenProperty = this._dockConfiguration === WebInspector.DockConfiguration.Bottom ? "screenY" : "screenX";
+ let eventClientProperty = this._dockConfiguration === WebInspector.DockConfiguration.Bottom ? "clientY" : "clientX";
</ins><span class="cx">
</span><span class="cx"> var resizerElement = event.target;
</span><span class="cx"> var firstClientPosition = event[eventClientProperty];
</span><span class="lines">@@ -1677,7 +1692,7 @@
</span><span class="cx"> // width or height should be the same in device pixels regardless of the document zoom.
</span><span class="cx"> dimension *= this._zoomFactor();
</span><span class="cx">
</span><del>- if (this._dockSide === "bottom")
</del><ins>+ if (this._dockConfiguration === WebInspector.DockConfiguration.Bottom)
</ins><span class="cx"> InspectorFrontendHost.setAttachedWindowHeight(dimension);
</span><span class="cx"> else
</span><span class="cx"> InspectorFrontendHost.setAttachedWindowWidth(dimension);
</span><span class="lines">@@ -1691,7 +1706,7 @@
</span><span class="cx"> WebInspector.elementDragEnd(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WebInspector.elementDragStart(resizerElement, dockedResizerDrag.bind(this), dockedResizerDragEnd.bind(this), event, this._dockSide === "bottom" ? "row-resize" : "col-resize");
</del><ins>+ WebInspector.elementDragStart(resizerElement, dockedResizerDrag.bind(this), dockedResizerDragEnd.bind(this), event, this._dockConfiguration === WebInspector.DockConfiguration.Bottom ? "row-resize" : "col-resize");
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector._moveWindowMouseDown = function(event)
</span><span class="lines">@@ -2491,3 +2506,9 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.showRepresentedObject(representedObject, dialog.cookie);
</span><span class="cx"> };
</span><ins>+
+WebInspector.DockConfiguration = {
+ Right: "right",
+ Bottom: "bottom",
+ Undocked: "undocked",
+};
</ins></span></pre>
</div>
</div>
</body>
</html>