diff options
| author | bors <bors@rust-lang.org> | 2016-05-21 23:58:57 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-21 23:58:57 -0700 |
| commit | e24d621fcacf59fa8ecc1c1af1c4adeded4bddee (patch) | |
| tree | 368e24ed380833918b9e700a83311af732c0e169 /src | |
| parent | 14d6a10c597a5f1f95a2f0125a87e2107b5d80ff (diff) | |
| parent | ab09fbca234d491fbd09857eb414d2586d283c67 (diff) | |
| download | rust-e24d621fcacf59fa8ecc1c1af1c4adeded4bddee.tar.gz rust-e24d621fcacf59fa8ecc1c1af1c4adeded4bddee.zip | |
Auto merge of #33765 - alex-ozdemir:master, r=Manishearth
Added a `rustdoc` shortcut for collapse/expand all Now when the user presses the "+" key all sections will collapse/expand. Also added a note to the help screen which describes this behavior. This required increasing the height of the help screen.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/html/layout.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/static/main.js | 10 | ||||
| -rw-r--r-- | src/librustdoc/html/static/rustdoc.css | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs index a168fe98a94..265ed6be155 100644 --- a/src/librustdoc/html/layout.rs +++ b/src/librustdoc/html/layout.rs @@ -103,6 +103,8 @@ r##"<!DOCTYPE html> <dd>Move down in search results</dd> <dt>⏎</dt> <dd>Go to active search result</dd> + <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 a368b4197a3..0ec5cab78bc 100644 --- a/src/librustdoc/html/static/main.js +++ b/src/librustdoc/html/static/main.js @@ -124,6 +124,10 @@ focusSearchBar(); break; + case "+": + toggleAllDocs(); + break; + case "?": if (ev.shiftKey && $("#help").hasClass("hidden")) { ev.preventDefault(); @@ -931,7 +935,7 @@ return "\u2212"; // "\u2212" is '−' minus sign } - $("#toggle-all-docs").on("click", function() { + function toggleAllDocs() { var toggle = $("#toggle-all-docs"); if (toggle.hasClass("will-expand")) { toggle.removeClass("will-expand"); @@ -950,7 +954,9 @@ $(".toggle-wrapper").addClass("collapsed"); $(".collapse-toggle").children(".inner").text(labelForToggleButton(true)); } - }); + } + + $("#toggle-all-docs").on("click", toggleAllDocs); $(document).on("click", ".collapse-toggle", function() { var toggle = $(this); diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css index a52a914fea6..8e4245d4ebf 100644 --- a/src/librustdoc/html/static/rustdoc.css +++ b/src/librustdoc/html/static/rustdoc.css @@ -472,7 +472,7 @@ body.blur > :not(#help) { background: #e9e9e9; box-shadow: 0 0 6px rgba(0,0,0,.2); width: 550px; - height: 300px; + height: 330px; border: 1px solid #bfbfbf; } #help dt { |