diff options
| author | Zach Pomerantz <zmp@umich.edu> | 2014-06-18 11:25:04 -0700 |
|---|---|---|
| committer | zzmp <zmp@umich.edu> | 2014-06-19 09:56:59 -0700 |
| commit | 677e6ed6035b12a3ccb6becc9c9f6ea3d74ce37b (patch) | |
| tree | 2efdbd5cc7d7117e1fd555b75a966a932f272001 | |
| parent | bb06790c37e839c98427b966cd079da712268415 (diff) | |
| download | rust-677e6ed6035b12a3ccb6becc9c9f6ea3d74ce37b.tar.gz rust-677e6ed6035b12a3ccb6becc9c9f6ea3d74ce37b.zip | |
(doc) Properly doc hotkeys in generated docs.
Updated search bar to match help text. Used correct, normalized hotkeys in search. Updated shortcut menu with working shortcuts (tabs). Changed height of search help.
| -rw-r--r-- | src/librustdoc/html/layout.rs | 6 | ||||
| -rw-r--r-- | src/librustdoc/html/static/main.css | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/static/main.js | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs index 0304a1d690e..61a2d3c5d9c 100644 --- a/src/librustdoc/html/layout.rs +++ b/src/librustdoc/html/layout.rs @@ -63,7 +63,7 @@ r##"<!DOCTYPE html> <div class="search-container"> <input class="search-input" name="search" autocomplete="off" - placeholder="Click or press 's' to search, '?' for more options..." + placeholder="Click or press 'S' to search, '?' for more options..." type="search"> </div> </form> @@ -82,9 +82,9 @@ r##"<!DOCTYPE html> <dd>Show this help dialog</dd> <dt>S</dt> <dd>Focus the search field</dd> - <dt>↑</dt> + <dt>⇤</dt> <dd>Move up in search results</dd> - <dt>↓</dt> + <dt>⇥</dt> <dd>Move down in search results</dd> <dt>⏎</dt> <dd>Go to active search result</dd> diff --git a/src/librustdoc/html/static/main.css b/src/librustdoc/html/static/main.css index a7bd082ec17..a88992f6c4c 100644 --- a/src/librustdoc/html/static/main.css +++ b/src/librustdoc/html/static/main.css @@ -347,7 +347,7 @@ p a:hover { text-decoration: underline; } margin-top: -125px; margin-left: -275px; width: 550px; - height: 250px; + height: 300px; border: 1px solid #bfbfbf; } diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js index 697199e9abf..fc1e480f6af 100644 --- a/src/librustdoc/html/static/main.js +++ b/src/librustdoc/html/static/main.js @@ -71,10 +71,10 @@ return; } - if (e.keyCode === 188 && $('#help').hasClass('hidden')) { // question mark + if (e.which === 191 && $('#help').hasClass('hidden')) { // question mark e.preventDefault(); $('#help').removeClass('hidden'); - } else if (e.keyCode === 27) { // esc + } else if (e.which === 27) { // esc if (!$('#help').hasClass('hidden')) { e.preventDefault(); $('#help').addClass('hidden'); @@ -83,7 +83,7 @@ $('#search').addClass('hidden'); $('#main').removeClass('hidden'); } - } else if (e.keyCode === 83) { // S + } else if (e.which === 83) { // S e.preventDefault(); $('.search-input').focus(); } @@ -361,7 +361,7 @@ $(document).on('keypress.searchnav', function(e) { var $active = $results.filter('.highlighted'); - if (e.keyCode === 38) { // up + if (e.which === 38) { // up e.preventDefault(); if (!$active.length || !$active.prev()) { return; @@ -369,7 +369,7 @@ $active.prev().addClass('highlighted'); $active.removeClass('highlighted'); - } else if (e.keyCode === 40) { // down + } else if (e.which === 40) { // down e.preventDefault(); if (!$active.length) { $results.first().addClass('highlighted'); @@ -377,7 +377,7 @@ $active.next().addClass('highlighted'); $active.removeClass('highlighted'); } - } else if (e.keyCode === 13) { // return + } else if (e.which === 13) { // return e.preventDefault(); if ($active.length) { document.location.href = $active.find('a').prop('href'); |