IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Use a better selector for search menu (#14390)

Browse Source 
".search-menu" matches the parent element of the element that was
previously selected. This is a better choice because it offers some
flexibility over the DOM structure without breaking the keyboard
shortcuts.
This commit is contained in:
Bianca Nenciu 2021-09-21 15:51:29 +03:00 committed by GitHub
parent 27699648ef
commit d940a8e41a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/app/widgets/search-menu.js
View File

@ -332,14 +332,14 @@ export default createWidget("search-menu", {
const up = e.which === 38; const up = e.which === 38;
const down = e.which === 40; const down = e.which === 40;
if (up || down) { if (up || down) {
let focused = $("header .panel-body *:focus")[0]; let focused = $(".search-menu *:focus")[0];
if (!focused) { if (!focused) {
return; return;
} }
let links = $("header .panel-body .results a"); let links = $(".search-menu .results a");
let results = $("header .panel-body .results .search-link"); let results = $(".search-menu .results .search-link");
let prevResult; let prevResult;
let result; let result;
@ -361,9 +361,9 @@ export default createWidget("search-menu", {
} }
if (index === -1 && down) { if (index === -1 && down) {
$("header .panel-body .search-link:first").focus(); $(".search-menu .search-link:first").focus();
} else if (index === 0 && up) { } else if (index === 0 && up) {
$("header .panel-body input:first").focus(); $(".search-menu input:first").focus();
} else if (index > -1) { } else if (index > -1) {
index += down ? 1 : -1; index += down ? 1 : -1;
if (index >= 0 && index < results.length) { if (index >= 0 && index < results.length) {