diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-06 15:25:05 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-06 15:25:05 +0000 |
| commit | fcc39d551977888fef161492cd47b502ed4c325b (patch) | |
| tree | 0fdd2c0db080302c87eb78a72c8e56383682c4ad | |
| parent | 17de909a42fa5d641eb9554e94fee59fb0762cbc (diff) | |
| parent | 1a86a00ca338811a0ffb5dd9a4d2a2ec84db13e6 (diff) | |
| download | gitlab-ce-fcc39d551977888fef161492cd47b502ed4c325b.tar.gz | |
Merge branch 'fix_search_in_file_tree' into 'master'
Fix search in Files
https://gitlab.com/gitlab-org/gitlab-ce/issues/1873
See merge request !1511
| -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 f730b22f0e5..0400dbfabec 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -39,6 +39,7 @@ v 8.0.4 - Fix anchors to comments in diffs - Remove CI token from build traces - Fix "Assign All" button on Runner admin page + - 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..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) |