diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-10-05 18:10:22 +0300 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-10-06 11:43:32 +0300 |
| commit | 1a86a00ca338811a0ffb5dd9a4d2a2ec84db13e6 (patch) | |
| tree | 2efa6d54b1b93d1baafa6fb581a86a9231cbb9b7 /app | |
| parent | 10d7c367b0a83dc5abf69c0e343b19696f542dd6 (diff) | |
| download | gitlab-ce-1a86a00ca338811a0ffb5dd9a4d2a2ec84db13e6.tar.gz | |
Fix search in Files
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/tree.js.coffee | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/tree.js.coffee b/app/assets/javascripts/tree.js.coffee index d428db5b422..de8eebcd0b2 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) |