diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-10-05 18:10:22 +0300 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-10-05 18:17:10 +0300 |
| commit | b1c2baf0c049a1ed6298ccc6c44b236e2870067d (patch) | |
| tree | 5b5bd813a1936455504a078047741989be3eeccc | |
| parent | 94dc0224e26469ad1d830104d0ac37ba21de8a9f (diff) | |
| download | gitlab-ce-fix_search_in_file_tree.tar.gz | |
Fix search in Filesfix_search_in_file_tree
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/tree.js.coffee | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index a455650bed9..9316379354f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -31,6 +31,7 @@ v 8.1.0 (unreleased) - Hide password in the service settings form - Fix anchors to comments in diffs - Move CI web hooks page to project settings area + - Fix search in Files v 8.0.3 - Fix URL shown in Slack notifications diff --git a/app/assets/javascripts/tree.js.coffee b/app/assets/javascripts/tree.js.coffee index d428db5b422..b64aead1fa0 100644 --- a/app/assets/javascripts/tree.js.coffee +++ b/app/assets/javascripts/tree.js.coffee @@ -16,6 +16,9 @@ class @TreeView li = $("tr.tree-item") liSelected = null $('body').keydown (e) -> + if $("input:focus").length > 0 && (e.which == 38 || e.which == 40) + return false + if e.which is 40 if liSelected next = liSelected.next() @@ -38,4 +41,4 @@ class @TreeView $(liSelected).focus() else if e.which is 13 path = $('.tree-item.selected .tree-item-file-name a').attr('href') - Turbolinks.visit(path) + if path then Turbolinks.visit(path) |