Title: [215543] trunk/Source/WebInspectorUI
- Revision
- 215543
- Author
- [email protected]
- Date
- 2017-04-19 16:41:19 -0700 (Wed, 19 Apr 2017)
Log Message
REGRESSION (r209882): Web Inspector: Console's filter bar has text search field, but the next/previous buttons don't do anything
https://bugs.webkit.org/show_bug.cgi?id=170556
<rdar://problem/31481755>
Reviewed by Matt Baker.
* UserInterface/Views/LogContentView.js:
(WebInspector.LogContentView.prototype.performSearch):
Update numberOfResults setter, which sets "disabled" attribute to false when numberOfResults > 0.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (215542 => 215543)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-04-19 23:38:57 UTC (rev 215542)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-04-19 23:41:19 UTC (rev 215543)
@@ -1,3 +1,15 @@
+2017-04-19 Nikita Vasilyev <[email protected]>
+
+ REGRESSION (r209882): Web Inspector: Console's filter bar has text search field, but the next/previous buttons don't do anything
+ https://bugs.webkit.org/show_bug.cgi?id=170556
+ <rdar://problem/31481755>
+
+ Reviewed by Matt Baker.
+
+ * UserInterface/Views/LogContentView.js:
+ (WebInspector.LogContentView.prototype.performSearch):
+ Update numberOfResults setter, which sets "disabled" attribute to false when numberOfResults > 0.
+
2017-04-18 Matt Baker <[email protected]>
Web Inspector: XHR breakpoints shouldn't be cleared from the sidebar on reload
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (215542 => 215543)
--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2017-04-19 23:38:57 UTC (rev 215542)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2017-04-19 23:41:19 UTC (rev 215543)
@@ -921,6 +921,7 @@
this._searchMatches = [];
this._selectedSearchMatchIsValid = false;
this._selectedSearchMatch = null;
+ let numberOfResults = 0;
if (this._currentSearchQuery === "") {
this.element.classList.remove(WebInspector.LogContentView.SearchInProgressStyleClassName);
@@ -936,6 +937,7 @@
let text = message.textContent;
let match = searchRegex.exec(text);
while (match) {
+ numberOfResults++;
matchRanges.push({offset: match.index, length: match[0].length});
match = searchRegex.exec(text);
}
@@ -952,6 +954,8 @@
this.dispatchEventToListeners(WebInspector.ContentView.Event.NumberOfSearchResultsDidChange);
+ this._findBanner.numberOfResults = numberOfResults;
+
if (!this._selectedSearchMatchIsValid && this._selectedSearchMatch) {
this._selectedSearchMatch.highlight.classList.remove(WebInspector.LogContentView.SelectedStyleClassName);
this._selectedSearchMatch = null;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
