<!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>[204124] 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/204124">204124</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-08-04 10:47:19 -0700 (Thu, 04 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: UI polish for Open Quickly and Goto Line dialogs
https://bugs.webkit.org/show_bug.cgi?id=159849
<rdar://problem/27383068>
Reviewed by Brian Burg.
* UserInterface/Images/Search.svg: Added.
Magnifying glass icon.
* UserInterface/Views/GoToLineDialog.css:
(.go-to-line-dialog):
(.go-to-line-dialog > div):
(.go-to-line-dialog > div::before):
* UserInterface/Views/OpenResourceDialog.css:
(.open-resource-dialog > .field):
(.open-resource-dialog > .field::before):
(.open-resource-dialog.has-results > .tree-outline):
(.open-resource-dialog > .tree-outline .item):
Add search icon to left of the input field in both dialogs,
and adjust styles to better match Xcode 8.
* UserInterface/Views/OpenResourceDialog.js:
(WebInspector.OpenResourceDialog):
Remove "input" event listener, as styles are now toggled in _updateFilter.
(WebInspector.OpenResourceDialog.prototype._updateFilter):
Toggle "has-results" and "non-empty" class names.
(WebInspector.OpenResourceDialog.prototype._handleInputEvent): Deleted.
(WebInspector.OpenResourceDialog.prototype._clear): Deleted.
Moved class toggle to _updateFilter.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsGoToLineDialogcss">trunk/Source/WebInspectorUI/UserInterface/Views/GoToLineDialog.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsOpenResourceDialogcss">trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsOpenResourceDialogjs">trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesSearchsvg">trunk/Source/WebInspectorUI/UserInterface/Images/Search.svg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (204123 => 204124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-08-04 17:02:42 UTC (rev 204123)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-08-04 17:47:19 UTC (rev 204124)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-08-04 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: UI polish for Open Quickly and Goto Line dialogs
+ https://bugs.webkit.org/show_bug.cgi?id=159849
+ <rdar://problem/27383068>
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Images/Search.svg: Added.
+ Magnifying glass icon.
+
+ * UserInterface/Views/GoToLineDialog.css:
+ (.go-to-line-dialog):
+ (.go-to-line-dialog > div):
+ (.go-to-line-dialog > div::before):
+ * UserInterface/Views/OpenResourceDialog.css:
+ (.open-resource-dialog > .field):
+ (.open-resource-dialog > .field::before):
+ (.open-resource-dialog.has-results > .tree-outline):
+ (.open-resource-dialog > .tree-outline .item):
+ Add search icon to left of the input field in both dialogs,
+ and adjust styles to better match Xcode 8.
+
+ * UserInterface/Views/OpenResourceDialog.js:
+ (WebInspector.OpenResourceDialog):
+ Remove "input" event listener, as styles are now toggled in _updateFilter.
+ (WebInspector.OpenResourceDialog.prototype._updateFilter):
+ Toggle "has-results" and "non-empty" class names.
+ (WebInspector.OpenResourceDialog.prototype._handleInputEvent): Deleted.
+ (WebInspector.OpenResourceDialog.prototype._clear): Deleted.
+ Moved class toggle to _updateFilter.
+
</ins><span class="cx"> 2016-08-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop DocumentType.internalSubset attribute
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesSearchsvg"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Images/Search.svg (0 => 204124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/Search.svg (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/Search.svg 2016-08-04 17:47:19 UTC (rev 204124)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright © 2016 Apple Inc. All rights reserved. -->
+<svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16">
+ <circle fill="none" stroke="currentColor" cx="7" cy="7" r="3"/>
+ <path fill="none" stroke="currentColor" d="M 9 9 L 13.5 13.5"/>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsGoToLineDialogcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/GoToLineDialog.css (204123 => 204124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/GoToLineDialog.css 2016-08-04 17:02:42 UTC (rev 204123)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/GoToLineDialog.css 2016-08-04 17:47:19 UTC (rev 204124)
</span><span class="lines">@@ -24,7 +24,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> .go-to-line-dialog {
</span><del>- position: relative;
</del><ins>+ display: flex;
+ flex-direction: column;
+
+ position: absolute;
</ins><span class="cx"> left: 50%;
</span><span class="cx"> top: 21px;
</span><span class="cx"> width: calc(100% - 40px);
</span><span class="lines">@@ -33,8 +36,6 @@
</span><span class="cx">
</span><span class="cx"> transform: translate(-50%, 0);
</span><span class="cx">
</span><del>- padding: 8px 3px;
-
</del><span class="cx"> border-radius: 5px;
</span><span class="cx"> background-color: hsla(0, 0%, 95%, 0.8);
</span><span class="cx"> border: 1px hsla(0, 0%, 0%, 0.25) solid;
</span><span class="lines">@@ -44,10 +45,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .go-to-line-dialog > div {
</span><del>- width: 100%;
- height: 100%;
</del><ins>+ margin: 8px 3px 8px 32px;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.go-to-line-dialog > div::before {
+ position: absolute;
+ left: 6px;
+ top: 6px;
+ width: 30px;
+ opacity: 0.5;
+ content: url(../Images/Search.svg);
+}
+
</ins><span class="cx"> .go-to-line-dialog > div > input {
</span><span class="cx"> display: block;
</span><span class="cx"> width: 100%;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsOpenResourceDialogcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.css (204123 => 204124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.css 2016-08-04 17:02:42 UTC (rev 204123)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.css 2016-08-04 17:47:19 UTC (rev 204124)
</span><span class="lines">@@ -48,9 +48,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .open-resource-dialog > .field {
</span><del>- margin: 8px 3px;
</del><ins>+ margin: 8px 3px 8px 32px;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.open-resource-dialog > .field::before {
+ position: absolute;
+ left: 6px;
+ top: 6px;
+ width: 30px;
+ opacity: 0.5;
+ content: url(../Images/Search.svg);
+}
+
</ins><span class="cx"> .open-resource-dialog > .field > input {
</span><span class="cx"> display: block;
</span><span class="cx"> width: 100%;
</span><span class="lines">@@ -97,7 +106,12 @@
</span><span class="cx"> border-bottom-right-radius: 4px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.open-resource-dialog.has-results > .tree-outline {
+ border-top: solid 1px var(--border-color);
+}
+
</ins><span class="cx"> .open-resource-dialog > .tree-outline .item {
</span><ins>+ padding-left: 10px;
</ins><span class="cx"> border: none;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsOpenResourceDialogjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js (204123 => 204124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js 2016-08-04 17:02:42 UTC (rev 204123)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js 2016-08-04 17:47:19 UTC (rev 204124)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx">
</span><span class="cx"> this._clearIconElement = fieldElement.appendChild(document.createElement("img"));
</span><span class="cx">
</span><del>- this._inputElement.addEventListener("input", this._handleInputEvent.bind(this));
</del><span class="cx"> this._inputElement.addEventListener("keydown", this._handleKeydownEvent.bind(this));
</span><span class="cx"> this._inputElement.addEventListener("keyup", this._handleKeyupEvent.bind(this));
</span><span class="cx"> this._inputElement.addEventListener("blur", this._handleBlurEvent.bind(this));
</span><span class="lines">@@ -48,7 +47,7 @@
</span><span class="cx"> this._clearIconElement.addEventListener("mousedown", this._handleMousedownEvent.bind(this));
</span><span class="cx"> this._clearIconElement.addEventListener("click", this._handleClickEvent.bind(this));
</span><span class="cx">
</span><del>- this._treeOutline = new WebInspector.TreeOutline(document.createElement("ol"));
</del><ins>+ this._treeOutline = new WebInspector.TreeOutline;
</ins><span class="cx"> this._treeOutline.allowsRepeatSelection = true;
</span><span class="cx"> this._treeOutline.disclosureButtons = false;
</span><span class="cx"> this._treeOutline.large = true;
</span><span class="lines">@@ -140,12 +139,6 @@
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _handleInputEvent(event)
- {
- let force = this._inputElement.value !== "";
- this.element.classList.toggle(WebInspector.OpenResourceDialog.NonEmptyClassName, force);
- }
-
</del><span class="cx"> _handleKeydownEvent(event)
</span><span class="cx"> {
</span><span class="cx"> if (event.keyCode === WebInspector.KeyboardShortcut.Key.Escape.keyCode) {
</span><span class="lines">@@ -211,7 +204,6 @@
</span><span class="cx"> _clear()
</span><span class="cx"> {
</span><span class="cx"> this._inputElement.value = "";
</span><del>- this.element.classList.remove(WebInspector.OpenResourceDialog.NonEmptyClassName);
</del><span class="cx"> this._updateFilter();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -218,18 +210,16 @@
</span><span class="cx"> _updateFilter()
</span><span class="cx"> {
</span><span class="cx"> this._filteredResults = [];
</span><del>- this._treeOutline.hidden = true;
</del><span class="cx"> this._treeOutline.removeChildren();
</span><span class="cx">
</span><span class="cx"> let filterText = this._inputElement.value.trim();
</span><del>- if (!filterText)
- return;
</del><ins>+ if (filterText) {
+ this._filteredResults = this._queryController.executeQuery(filterText);
+ this._populateResourceTreeOutline();
+ }
</ins><span class="cx">
</span><del>- this._filteredResults = this._queryController.executeQuery(filterText);
-
- this._populateResourceTreeOutline();
- if (this._treeOutline.children.length)
- this._treeOutline.hidden = false;
</del><ins>+ this.element.classList.toggle("non-empty", this._inputElement.value !== "");
+ this.element.classList.toggle("has-results", this._treeOutline.children.length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _treeSelectionDidChange(event)
</span><span class="lines">@@ -286,5 +276,3 @@
</span><span class="cx"> this._addResource(event.data.resource);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.OpenResourceDialog.NonEmptyClassName = "non-empty";
</del></span></pre>
</div>
</div>
</body>
</html>