diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-05 15:19:31 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-05 15:19:31 +0300 |
| commit | 96448d1b7b48820a10bd0fff0ba95de56117e7e8 (patch) | |
| tree | 2436210ad9ea30955138431aa628b49290ca3935 /app | |
| parent | 5067e9dc88b5bf4d1aae06a8c12bb05d082f4f74 (diff) | |
| download | gitlab-ce-96448d1b7b48820a10bd0fff0ba95de56117e7e8.tar.gz | |
Fix shortcuts popup
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/main.js.coffee | 8 | ||||
| -rw-r--r-- | app/views/help/_shortcuts.html.haml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee index cb9678d4839..0e7e0a4de13 100644 --- a/app/assets/javascripts/main.js.coffee +++ b/app/assets/javascripts/main.js.coffee @@ -67,10 +67,6 @@ $ -> $('.appear-data').fadeIn() e.preventDefault() - $('body').keydown (e) -> - if e.which is 191 - new Shortcuts() - # Initialize chosen selects $('select.chosen').chosen() @@ -114,6 +110,10 @@ $ -> when 115 $("#search").focus() e.preventDefault() + when 63 + new Shortcuts() + e.preventDefault() + # Commit show suppressed diff $(".supp_diff_link").bind "click", -> diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml index 7cbe5fc45ff..793cb450c98 100644 --- a/app/views/help/_shortcuts.html.haml +++ b/app/views/help/_shortcuts.html.haml @@ -1,6 +1,6 @@ #modal-shortcuts.modal.hide .modal-header - %a.close{href: "#"} × + %a.close{href: "#", "data-dismiss" => "modal"} × %h3 Keyboard Shortcuts .modal-body %h5 Global Shortcuts |