- Revision
- 204124
- Author
- mattba...@apple.com
- Date
- 2016-08-04 10:47:19 -0700 (Thu, 04 Aug 2016)
Log Message
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.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (204123 => 204124)
--- 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)
@@ -1,3 +1,35 @@
+2016-08-04 Matt Baker <mattba...@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.
+
2016-08-03 Chris Dumez <cdu...@apple.com>
Drop DocumentType.internalSubset attribute
Added: trunk/Source/WebInspectorUI/UserInterface/Images/Search.svg (0 => 204124)
--- 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)
@@ -0,0 +1,6 @@
+<?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>
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/GoToLineDialog.css (204123 => 204124)
--- 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)
@@ -24,7 +24,10 @@
*/
.go-to-line-dialog {
- position: relative;
+ display: flex;
+ flex-direction: column;
+
+ position: absolute;
left: 50%;
top: 21px;
width: calc(100% - 40px);
@@ -33,8 +36,6 @@
transform: translate(-50%, 0);
- padding: 8px 3px;
-
border-radius: 5px;
background-color: hsla(0, 0%, 95%, 0.8);
border: 1px hsla(0, 0%, 0%, 0.25) solid;
@@ -44,10 +45,18 @@
}
.go-to-line-dialog > div {
- width: 100%;
- height: 100%;
+ margin: 8px 3px 8px 32px;
}
+.go-to-line-dialog > div::before {
+ position: absolute;
+ left: 6px;
+ top: 6px;
+ width: 30px;
+ opacity: 0.5;
+ content: url(../Images/Search.svg);
+}
+
.go-to-line-dialog > div > input {
display: block;
width: 100%;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.css (204123 => 204124)
--- 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)
@@ -48,9 +48,18 @@
}
.open-resource-dialog > .field {
- margin: 8px 3px;
+ margin: 8px 3px 8px 32px;
}
+.open-resource-dialog > .field::before {
+ position: absolute;
+ left: 6px;
+ top: 6px;
+ width: 30px;
+ opacity: 0.5;
+ content: url(../Images/Search.svg);
+}
+
.open-resource-dialog > .field > input {
display: block;
width: 100%;
@@ -97,7 +106,12 @@
border-bottom-right-radius: 4px;
}
+.open-resource-dialog.has-results > .tree-outline {
+ border-top: solid 1px var(--border-color);
+}
+
.open-resource-dialog > .tree-outline .item {
+ padding-left: 10px;
border: none;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js (204123 => 204124)
--- 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)
@@ -41,7 +41,6 @@
this._clearIconElement = fieldElement.appendChild(document.createElement("img"));
- this._inputElement.addEventListener("input", this._handleInputEvent.bind(this));
this._inputElement.addEventListener("keydown", this._handleKeydownEvent.bind(this));
this._inputElement.addEventListener("keyup", this._handleKeyupEvent.bind(this));
this._inputElement.addEventListener("blur", this._handleBlurEvent.bind(this));
@@ -48,7 +47,7 @@
this._clearIconElement.addEventListener("mousedown", this._handleMousedownEvent.bind(this));
this._clearIconElement.addEventListener("click", this._handleClickEvent.bind(this));
- this._treeOutline = new WebInspector.TreeOutline(document.createElement("ol"));
+ this._treeOutline = new WebInspector.TreeOutline;
this._treeOutline.allowsRepeatSelection = true;
this._treeOutline.disclosureButtons = false;
this._treeOutline.large = true;
@@ -140,12 +139,6 @@
// Private
- _handleInputEvent(event)
- {
- let force = this._inputElement.value !== "";
- this.element.classList.toggle(WebInspector.OpenResourceDialog.NonEmptyClassName, force);
- }
-
_handleKeydownEvent(event)
{
if (event.keyCode === WebInspector.KeyboardShortcut.Key.Escape.keyCode) {
@@ -211,7 +204,6 @@
_clear()
{
this._inputElement.value = "";
- this.element.classList.remove(WebInspector.OpenResourceDialog.NonEmptyClassName);
this._updateFilter();
}
@@ -218,18 +210,16 @@
_updateFilter()
{
this._filteredResults = [];
- this._treeOutline.hidden = true;
this._treeOutline.removeChildren();
let filterText = this._inputElement.value.trim();
- if (!filterText)
- return;
+ if (filterText) {
+ this._filteredResults = this._queryController.executeQuery(filterText);
+ this._populateResourceTreeOutline();
+ }
- this._filteredResults = this._queryController.executeQuery(filterText);
-
- this._populateResourceTreeOutline();
- if (this._treeOutline.children.length)
- this._treeOutline.hidden = false;
+ this.element.classList.toggle("non-empty", this._inputElement.value !== "");
+ this.element.classList.toggle("has-results", this._treeOutline.children.length);
}
_treeSelectionDidChange(event)
@@ -286,5 +276,3 @@
this._addResource(event.data.resource);
}
};
-
-WebInspector.OpenResourceDialog.NonEmptyClassName = "non-empty";
