<!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>[212427] 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/212427">212427</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-16 02:17:59 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: popovers shouldn't be dismissed when Web Inspector window is dragged
https://bugs.webkit.org/show_bug.cgi?id=166935
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2017-02-16
Reviewed by Joseph Pecoraro.
* UserInterface/Base/Main.js:
(WebInspector.contentLoaded):
(WebInspector._mouseDown): Created.
(WebInspector._dockedResizerMouseDown):
(WebInspector._moveWindowMouseDown):
Applies Popover.EventPreventDismissSymbol whenever a mousedown event is fired for an element
that controls the positioning or size of the WebInspector window.
* UserInterface/Views/Popover.js:
(WebInspector.Popover.prototype._handleEvent):
(WebInspector.Popover.EventPreventDismissSymbol):
Do not dismiss the popover if Popover.EventPreventDismissSymbol is applied to the event.</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="#trunkSourceWebInspectorUIUserInterfaceViewsPopoverjs">trunk/Source/WebInspectorUI/UserInterface/Views/Popover.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (212426 => 212427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-02-16 09:58:06 UTC (rev 212426)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-02-16 10:17:59 UTC (rev 212427)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-02-16 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Web Inspector: popovers shouldn't be dismissed when Web Inspector window is dragged
+ https://bugs.webkit.org/show_bug.cgi?id=166935
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.contentLoaded):
+ (WebInspector._mouseDown): Created.
+ (WebInspector._dockedResizerMouseDown):
+ (WebInspector._moveWindowMouseDown):
+ Applies Popover.EventPreventDismissSymbol whenever a mousedown event is fired for an element
+ that controls the positioning or size of the WebInspector window.
+
+ * UserInterface/Views/Popover.js:
+ (WebInspector.Popover.prototype._handleEvent):
+ (WebInspector.Popover.EventPreventDismissSymbol):
+ Do not dismiss the popover if Popover.EventPreventDismissSymbol is applied to the event.
+
</ins><span class="cx"> 2017-02-15 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Request headers when copied & pasted should follow HTTP format, colon instead of tab
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (212426 => 212427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2017-02-16 09:58:06 UTC (rev 212426)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2017-02-16 10:17:59 UTC (rev 212427)
</span><span class="lines">@@ -217,6 +217,7 @@
</span><span class="cx"> window.addEventListener("resize", this._windowResized.bind(this));
</span><span class="cx"> window.addEventListener("keydown", this._windowKeyDown.bind(this));
</span><span class="cx"> window.addEventListener("keyup", this._windowKeyUp.bind(this));
</span><ins>+ window.addEventListener("mousedown", this._mouseDown.bind(this), true);
</ins><span class="cx"> window.addEventListener("mousemove", this._mouseMoved.bind(this), true);
</span><span class="cx"> window.addEventListener("pagehide", this._pageHidden.bind(this));
</span><span class="cx"> window.addEventListener("contextmenu", this._contextMenuRequested.bind(this));
</span><span class="lines">@@ -347,12 +348,15 @@
</span><span class="cx"> this._closeToolbarButton.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this.close, this);
</span><span class="cx">
</span><span class="cx"> this._undockToolbarButton = new WebInspector.ButtonToolbarItem("undock", WebInspector.UIString("Detach into separate window"), null, "Images/Undock.svg");
</span><ins>+ this._undockToolbarButton.element.classList.add(WebInspector.Popover.IgnoreAutoDismissClassName);
</ins><span class="cx"> this._undockToolbarButton.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._undock, this);
</span><span class="cx">
</span><span class="cx"> this._dockRightToolbarButton = new WebInspector.ButtonToolbarItem("dock-right", WebInspector.UIString("Dock to right of window"), null, "Images/DockRight.svg");
</span><ins>+ this._dockRightToolbarButton.element.classList.add(WebInspector.Popover.IgnoreAutoDismissClassName);
</ins><span class="cx"> this._dockRightToolbarButton.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._dockRight, this);
</span><span class="cx">
</span><span class="cx"> this._dockBottomToolbarButton = new WebInspector.ButtonToolbarItem("dock-bottom", WebInspector.UIString("Dock to bottom of window"), null, "Images/DockBottom.svg");
</span><ins>+ this._dockBottomToolbarButton.element.classList.add(WebInspector.Popover.IgnoreAutoDismissClassName);
</ins><span class="cx"> this._dockBottomToolbarButton.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._dockBottom, this);
</span><span class="cx">
</span><span class="cx"> this._togglePreviousDockConfigurationKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "D", this._togglePreviousDockConfiguration.bind(this));
</span><span class="lines">@@ -415,8 +419,9 @@
</span><span class="cx">
</span><span class="cx"> this.modifierKeys = {altKey: false, metaKey: false, shiftKey: false};
</span><span class="cx">
</span><del>- this.toolbar.element.addEventListener("mousedown", this._toolbarMouseDown.bind(this));
- document.getElementById("docked-resizer").addEventListener("mousedown", this._dockedResizerMouseDown.bind(this));
</del><ins>+ let dockedResizerElement = document.getElementById("docked-resizer");
+ dockedResizerElement.classList.add(WebInspector.Popover.IgnoreAutoDismissClassName);
+ dockedResizerElement.addEventListener("mousedown", this._dockedResizerMouseDown.bind(this));
</ins><span class="cx">
</span><span class="cx"> this._dockingAvailable = false;
</span><span class="cx">
</span><span class="lines">@@ -1486,6 +1491,12 @@
</span><span class="cx"> this._updateModifierKeys(event);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector._mouseDown = function(event)
+{
+ if (this.toolbar.element.isSelfOrAncestor(event.target))
+ this._toolbarMouseDown(event);
+};
+
</ins><span class="cx"> WebInspector._mouseMoved = function(event)
</span><span class="cx"> {
</span><span class="cx"> this._updateModifierKeys(event);
</span><span class="lines">@@ -1713,6 +1724,8 @@
</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><ins>+ event[WebInspector.Popover.EventPreventDismissSymbol] = true;
+
</ins><span class="cx"> let windowProperty = this._dockConfiguration === WebInspector.DockConfiguration.Bottom ? "innerHeight" : "innerWidth";
</span><span class="cx"> let eventScreenProperty = this._dockConfiguration === WebInspector.DockConfiguration.Bottom ? "screenY" : "screenX";
</span><span class="cx"> let eventClientProperty = this._dockConfiguration === WebInspector.DockConfiguration.Bottom ? "clientY" : "clientX";
</span><span class="lines">@@ -1776,6 +1789,8 @@
</span><span class="cx"> !event.target.classList.contains("item-section"))
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ event[WebInspector.Popover.EventPreventDismissSymbol] = true;
+
</ins><span class="cx"> if (WebInspector.Platform.name === "mac") {
</span><span class="cx"> // New Mac releases can start a window drag.
</span><span class="cx"> if (WebInspector.Platform.version.release >= 11) {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsPopoverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Popover.js (212426 => 212427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Popover.js 2017-02-16 09:58:06 UTC (rev 212426)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Popover.js 2017-02-16 10:17:59 UTC (rev 212427)
</span><span class="lines">@@ -167,8 +167,10 @@
</span><span class="cx"> switch (event.type) {
</span><span class="cx"> case "mousedown":
</span><span class="cx"> case "scroll":
</span><del>- if (!this._element.contains(event.target) && !event.target.enclosingNodeOrSelfWithClass(WebInspector.Popover.IgnoreAutoDismissClassName))
</del><ins>+ if (!this._element.contains(event.target) && !event.target.enclosingNodeOrSelfWithClass(WebInspector.Popover.IgnoreAutoDismissClassName)
+ && !event[WebInspector.Popover.EventPreventDismissSymbol]) {
</ins><span class="cx"> this.dismiss();
</span><ins>+ }
</ins><span class="cx"> break;
</span><span class="cx"> case "resize":
</span><span class="cx"> if (this._resizeHandler)
</span><span class="lines">@@ -598,3 +600,4 @@
</span><span class="cx"> WebInspector.Popover.AnchorSize = new WebInspector.Size(22, 11);
</span><span class="cx"> WebInspector.Popover.ShadowEdgeInsets = new WebInspector.EdgeInsets(WebInspector.Popover.ShadowPadding);
</span><span class="cx"> WebInspector.Popover.IgnoreAutoDismissClassName = "popover-ignore-auto-dismiss";
</span><ins>+WebInspector.Popover.EventPreventDismissSymbol = Symbol("popover-event-prevent-dismiss");
</ins></span></pre>
</div>
</div>
</body>
</html>