Skip to content

Commit 0be6863

Browse files
committed
Auto merge of rust-lang#45290 - GuillaumeGomez:fix-help, r=QuietMisdreavus
Hide help when search bar is focused Fixes rust-lang#45286 r? @rust-lang/docs
2 parents 611f375 + c6ce067 commit 0be6863

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

src/librustdoc/html/static/main.js

+18-7
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,20 @@
163163
return String.fromCharCode(c);
164164
}
165165

166+
function displayHelp(display, ev) {
167+
if (display === true) {
168+
if (hasClass(help, "hidden")) {
169+
ev.preventDefault();
170+
removeClass(help, "hidden");
171+
addClass(document.body, "blur");
172+
}
173+
} else if (!hasClass(help, "hidden")) {
174+
ev.preventDefault();
175+
addClass(help, "hidden");
176+
removeClass(document.body, "blur");
177+
}
178+
}
179+
166180
function handleShortcut(ev) {
167181
if (document.activeElement.tagName === "INPUT")
168182
return;
@@ -176,9 +190,7 @@
176190
case "Escape":
177191
var search = document.getElementById("search");
178192
if (!hasClass(help, "hidden")) {
179-
ev.preventDefault();
180-
addClass(help, "hidden");
181-
removeClass(document.body, "blur");
193+
displayHelp(false, ev);
182194
} else if (!hasClass(search, "hidden")) {
183195
ev.preventDefault();
184196
addClass(search, "hidden");
@@ -188,6 +200,7 @@
188200

189201
case "s":
190202
case "S":
203+
displayHelp(false, ev);
191204
ev.preventDefault();
192205
focusSearchBar();
193206
break;
@@ -198,10 +211,8 @@
198211
break;
199212

200213
case "?":
201-
if (ev.shiftKey && hasClass(help, "hidden")) {
202-
ev.preventDefault();
203-
removeClass(help, "hidden");
204-
addClass(document.body, "blur");
214+
if (ev.shiftKey) {
215+
displayHelp(true, ev);
205216
}
206217
break;
207218
}

0 commit comments

Comments
 (0)