OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #72691 - GuillaumeGomez:escape-key-handling, r=kinnison

Browse Source 
Fix escape key handling

Fixes #72647.

The problem was that you could have a timeout just after the moment you press "escape", putting back the results.

r? @kinnison
This commit is contained in:
Dylan DPC 2020-05-31 21:30:00 +02:00 committed by GitHub
commit 6cd9a67314
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/librustdoc/html/static/main.js
View File

@ -91,6 +91,7 @@ function defocusSearchBar() {
var disableShortcuts = getCurrentValue("rustdoc-disable-shortcuts") === "true";
var search_input = getSearchInput();
var searchTimeout = null;
// On the search screen, so you remain on the last tab you opened.
//
@ -101,6 +102,13 @@ function defocusSearchBar() {
var titleBeforeSearch = document.title;
function clearInputTimeout() {
if (searchTimeout !== null) {
clearTimeout(searchTimeout);
searchTimeout = null;
}
}
function getPageId() {
var id = document.location.href.split("#")[1];
if (id) {
@ -355,6 +363,7 @@ function defocusSearchBar() {
if (hasClass(help, "hidden") === false) {
displayHelp(false, ev, help);
} else if (hasClass(search, "hidden") === false) {
clearInputTimeout();
ev.preventDefault();
hideSearchResults(search);
document.title = titleBeforeSearch;
@ -1810,9 +1819,8 @@ function defocusSearchBar() {
}
function startSearch() {
var searchTimeout;
var callback = function() {
clearTimeout(searchTimeout);
clearInputTimeout();
if (search_input.value.length === 0) {
if (browserSupportsHistoryApi()) {
history.replaceState("", window.currentCrate + " - Rust", "?search=");
@ -1826,7 +1834,7 @@ function defocusSearchBar() {
search_input.oninput = callback;
document.getElementsByClassName("search-form")[0].onsubmit = function(e) {
e.preventDefault();
clearTimeout(searchTimeout);
clearInputTimeout();
search();
};
search_input.onchange = function(e) {
@ -1835,7 +1843,7 @@ function defocusSearchBar() {
return;
}
// Do NOT e.preventDefault() here. It will prevent pasting.
clearTimeout(searchTimeout);
clearInputTimeout();
// zero-timeout necessary here because at the time of event handler execution the
// pasted content is not in the input field yet. Shouldn’t make any difference for
// change, though.