about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Ozdemir <aozdemir@hmc.edu>2016-05-22 18:11:15 -0700
committerAlex Ozdemir <aozdemir@hmc.edu>2016-05-22 18:17:49 -0700
commit57ab0edaf0514646c8ca95d436c1edf97edfdc23 (patch)
tree32813634399206cfa434872fabfd8106c59bd75b
parent01dc9f0be4b3ab12d5c018548380ea6781350ec2 (diff)
downloadrust-57ab0edaf0514646c8ca95d436c1edf97edfdc23.tar.gz
rust-57ab0edaf0514646c8ca95d436c1edf97edfdc23.zip
Fixed shortcut handling. Reverted to [Shift]+[+=]
Realized browsers use [Ctrl]+[+=] for zoom, so using [Shift]+[+=] for
collapse/expand was not necessarily a conflict.

Also a bugfix.
-rw-r--r--src/librustdoc/html/layout.rs2
-rw-r--r--src/librustdoc/html/static/main.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
index 0af64573926..265ed6be155 100644
--- a/src/librustdoc/html/layout.rs
+++ b/src/librustdoc/html/layout.rs
@@ -103,7 +103,7 @@ r##"<!DOCTYPE html>
                     <dd>Move down in search results</dd>
                     <dt>&#9166;</dt>
                     <dd>Go to active search result</dd>
-                    <dt>T</dt>
+                    <dt>+</dt>
                     <dd>Collapse/expand all sections</dd>
                 </dl>
             </div>
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
index e8f23c4709d..14661dbaec4 100644
--- a/src/librustdoc/html/static/main.js
+++ b/src/librustdoc/html/static/main.js
@@ -124,8 +124,8 @@
             focusSearchBar();
             break;
 
-        case "t":
-        case "T":
+        case "+":
+            ev.preventDefault();
             toggleAllDocs();
             break;