From 9e0ccc5a479644bf35ffe04717d6e100fde74fcc Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Mon, 5 Mar 2018 23:37:33 +0100
Subject: [PATCH] Fix escape not working when searchbar selected
---
src/librustdoc/html/static/main.js | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
index 3f74ffbbe0b..f1c9c58a4eb 100644
--- a/src/librustdoc/html/static/main.js
+++ b/src/librustdoc/html/static/main.js
@@ -240,12 +240,15 @@
}
function handleShortcut(ev) {
- if (document.activeElement.tagName === "INPUT")
+ if (document.activeElement.tagName === "INPUT" &&
+ hasClass(document.getElementById('main'), "hidden")) {
return;
+ }
// Don't interfere with browser shortcuts
- if (ev.ctrlKey || ev.altKey || ev.metaKey)
+ if (ev.ctrlKey || ev.altKey || ev.metaKey) {
return;
+ }
var help = document.getElementById("help");
switch (getVirtualKey(ev)) {
@@ -1800,7 +1803,7 @@
if (!next) {
return;
}
- if (checkIfThereAreMethods(next.childNodes) &&
+ if ((checkIfThereAreMethods(next.childNodes) || hasClass(e, 'method')) &&
(hasClass(next, 'docblock') ||
hasClass(e, 'impl') ||
(hasClass(next, 'stability') &&