Title: [226415] trunk/Source/WebInspectorUI
- Revision
- 226415
- Author
- [email protected]
- Date
- 2018-01-04 12:56:43 -0800 (Thu, 04 Jan 2018)
Log Message
Web Inspector: ⌘G / ⇧⌘G text search does not working after closing find banner
https://bugs.webkit.org/show_bug.cgi?id=181280
<rdar://problem/36291175>
Patch by Joseph Pecoraro <[email protected]> on 2018-01-04
Reviewed by Matt Baker.
* UserInterface/Views/ContentBrowser.js:
(WI.ContentBrowser.prototype._findBannerDidHide):
When the find banner is hidden trigger a new ContentView method,
searchHidden instead of the destructive searchCleared. This allows
most content views (text editors, DOM tree, Network Headers view)
to keep their populated search results.
* UserInterface/Views/ContentView.js:
(WI.ContentView.prototype.searchHidden):
* UserInterface/Views/LogContentView.js:
(WI.LogContentView.prototype.searchHidden):
By default searchHidden does nothing. The Console's LogContentView
treats the find banner differently and clears its search results.
* UserInterface/Views/TextEditor.js:
(WI.TextEditor.prototype.searchCleared):
Modernize some code while working in this area.
* UserInterface/Views/Main.css:
(.bouncy-highlight):
Ensure black text on yellow background in the bouncy highlight. In the
DOM Tree it could have been white if the find banner was closed.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (226414 => 226415)
--- trunk/Source/WebInspectorUI/ChangeLog 2018-01-04 20:38:05 UTC (rev 226414)
+++ trunk/Source/WebInspectorUI/ChangeLog 2018-01-04 20:56:43 UTC (rev 226415)
@@ -1,3 +1,34 @@
+2018-01-04 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: ⌘G / ⇧⌘G text search does not working after closing find banner
+ https://bugs.webkit.org/show_bug.cgi?id=181280
+ <rdar://problem/36291175>
+
+ Reviewed by Matt Baker.
+
+ * UserInterface/Views/ContentBrowser.js:
+ (WI.ContentBrowser.prototype._findBannerDidHide):
+ When the find banner is hidden trigger a new ContentView method,
+ searchHidden instead of the destructive searchCleared. This allows
+ most content views (text editors, DOM tree, Network Headers view)
+ to keep their populated search results.
+
+ * UserInterface/Views/ContentView.js:
+ (WI.ContentView.prototype.searchHidden):
+ * UserInterface/Views/LogContentView.js:
+ (WI.LogContentView.prototype.searchHidden):
+ By default searchHidden does nothing. The Console's LogContentView
+ treats the find banner differently and clears its search results.
+
+ * UserInterface/Views/TextEditor.js:
+ (WI.TextEditor.prototype.searchCleared):
+ Modernize some code while working in this area.
+
+ * UserInterface/Views/Main.css:
+ (.bouncy-highlight):
+ Ensure black text on yellow background in the bouncy highlight. In the
+ DOM Tree it could have been white if the find banner was closed.
+
2018-01-03 Ting-Wei Lan <[email protected]>
Replace hard-coded paths in shebangs with #!/usr/bin/env
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js (226414 => 226415)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2018-01-04 20:38:05 UTC (rev 226414)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2018-01-04 20:56:43 UTC (rev 226415)
@@ -325,7 +325,7 @@
return;
currentContentView.automaticallyRevealFirstSearchResult = false;
- currentContentView.searchCleared();
+ currentContentView.searchHidden();
}
_contentViewNumberOfSearchResultsDidChange(event)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js (226414 => 226415)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js 2018-01-04 20:38:05 UTC (rev 226414)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js 2018-01-04 20:56:43 UTC (rev 226415)
@@ -445,6 +445,11 @@
// Implemented by subclasses.
}
+ searchHidden()
+ {
+ // Implemented by subclasses.
+ }
+
searchCleared()
{
// Implemented by subclasses.
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (226414 => 226415)
--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2018-01-04 20:38:05 UTC (rev 226414)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2018-01-04 20:56:43 UTC (rev 226415)
@@ -1076,6 +1076,11 @@
}
}
+ searchHidden()
+ {
+ this.searchCleared();
+ }
+
searchCleared()
{
this.performSearch("");
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Main.css (226414 => 226415)
--- trunk/Source/WebInspectorUI/UserInterface/Views/Main.css 2018-01-04 20:38:05 UTC (rev 226414)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Main.css 2018-01-04 20:56:43 UTC (rev 226415)
@@ -333,6 +333,7 @@
box-shadow: inset hsl(50, 91%, 76%) 0 -1px 0, hsl(52, 56%, 60%) 0 1px 1px, hsla(0, 0%, 0%, 0.33) 0 1px 2px 1px;
background-color: hsl(54, 93%, 70%);
+ color: black !important;
padding: 2px 4px;
margin-top: -2px;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js (226414 => 226415)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2018-01-04 20:38:05 UTC (rev 226414)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2018-01-04 20:56:43 UTC (rev 226415)
@@ -406,13 +406,11 @@
searchCleared()
{
- function clearResults() {
- for (var i = 0; i < this._searchResults.length; ++i)
- this._searchResults[i].clear();
- }
+ this._codeMirror.operation(() => {
+ for (let searchResult of this._searchResults)
+ searchResult.clear();
+ });
- this._codeMirror.operation(clearResults.bind(this));
-
this._searchQuery = null;
this._searchResults = [];
this._currentSearchResultIndex = -1;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
