Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

Commit 00d5aff

Browse files
Web Inspector: Search: don't steal focus from the search field when shown
https://bugs.webkit.org/show_bug.cgi?id=218260 Reviewed by Brian Burg. * UserInterface/Views/SearchSidebarPanel.js: (WI.SearchSidebarPanel.prototype.focusSearchField): (WI.SearchSidebarPanel.prototype.performSearch.createTreeElementForMatchObject): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@269074 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 1e5f259 commit 00d5aff

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

Source/WebInspectorUI/ChangeLog

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
2020-10-27 Devin Rousso <[email protected]>
2+
3+
Web Inspector: Search: don't steal focus from the search field when shown
4+
https://bugs.webkit.org/show_bug.cgi?id=218260
5+
6+
Reviewed by Brian Burg.
7+
8+
* UserInterface/Views/SearchSidebarPanel.js:
9+
(WI.SearchSidebarPanel.prototype.focusSearchField):
10+
(WI.SearchSidebarPanel.prototype.performSearch.createTreeElementForMatchObject):
11+
112
2020-10-27 Devin Rousso <[email protected]>
213

314
Web Inspector: REGRESSION(r266669): Uncaught Exception: TypeError: node.nodeType is not a function. (In 'node.nodeType()', 'node.nodeType' is undefined)

Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ WI.SearchSidebarPanel = class SearchSidebarPanel extends WI.NavigationSidebarPan
9393
this._inputElement.select();
9494

9595
if (performSearch)
96-
this.performSearch(this._inputElement.value);
96+
this.performSearch(this._inputElement.value, {omitFocus: true});
9797
}
9898

99-
performSearch(searchQuery)
99+
performSearch(searchQuery, {omitFocus} = {})
100100
{
101101
this._inputElement.value = searchQuery;
102102
this._searchQuerySetting.value = searchQuery;
@@ -141,7 +141,7 @@ WI.SearchSidebarPanel = class SearchSidebarPanel extends WI.NavigationSidebarPan
141141
createSearchingPlaceholder();
142142
WI.whenTargetsAvailable().then(() => {
143143
if (this._searchQuerySetting.value === searchQuery)
144-
this.performSearch(searchQuery);
144+
this.performSearch(searchQuery, {omitFocus});
145145
});
146146
return;
147147
}
@@ -176,8 +176,10 @@ WI.SearchSidebarPanel = class SearchSidebarPanel extends WI.NavigationSidebarPan
176176

177177
parentTreeElement.appendChild(matchTreeElement);
178178

179-
if (!this.contentTreeOutline.selectedTreeElement)
180-
matchTreeElement.revealAndSelect(false, true);
179+
if (!this.contentTreeOutline.selectedTreeElement) {
180+
const selectedByUser = true;
181+
matchTreeElement.revealAndSelect(omitFocus ?? false, selectedByUser);
182+
}
181183
}
182184

183185
function forEachMatch(lineContent, callback)

0 commit comments

Comments
 (0)