bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Add comment describing the Escape key weirdness

Browse source
This commit is contained in:
Michael Howell 2020-10-30 13:54:36 -07:00
parent 6918a17aa4
commit 90c7c634e3
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustdoc/html/render/mod.rs
View file

@ -807,7 +807,7 @@ function handleThemeButtonsBlur(e) {{
}} }}
}} }}
function handleThemeKeyPress(e) {{ function handleThemeKeyDown(e) {{
if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {{ return; }} if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {{ return; }}
if (!themePicker.parentNode.contains(e.target)) {{ return; }} if (!themePicker.parentNode.contains(e.target)) {{ return; }}
var active = document.activeElement; var active = document.activeElement;
@ -847,12 +847,18 @@ function handleThemeKeyPress(e) {{
e.preventDefault(); e.preventDefault();
themes.lastElementChild.focus(); themes.lastElementChild.focus();
break; break;
// The escape key is handled in main.js, instead of here, for two reasons:
//
// 1 Escape should close the menu, even if it's not focused.
// 2 The escape event handler is bound to both keydown and keypress, to work
// around browser inconsistencies. That sort of logic doesn't apply to the
// rest of these keybindings.
}} }}
}}; }};
themePicker.onclick = switchThemeButtonState; themePicker.onclick = switchThemeButtonState;
themePicker.onblur = handleThemeButtonsBlur; themePicker.onblur = handleThemeButtonsBlur;
document.addEventListener("keydown", handleThemeKeyPress); document.addEventListener("keydown", handleThemeKeyDown);
{}.forEach(function(item) {{ {}.forEach(function(item) {{
var but = document.createElement("button"); var but = document.createElement("button");
but.textContent = item; but.textContent = item;