diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-30 00:49:54 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-30 00:49:54 +0000 |
| commit | b32a6add8fa602eb35648f3f4661df8b98d909cb (patch) | |
| tree | 05a9e3bbaccf47acdbf2023dbb887de44b3c5e2a | |
| parent | 48843c0d85bea07f8c87877e8ba5c3ce1312aafb (diff) | |
| parent | d17046dbbc0c1212ab61cf1a9e1ea3aca54c9b72 (diff) | |
| download | gitlab-ce-b32a6add8fa602eb35648f3f4661df8b98d909cb.tar.gz | |
Merge branch 'fix_filebrowser_reload' into 'master'
File Browser navigation fixes
Fixes a double request being made when clicking the file name when navigating through file browser and also fixes opening a file in a new tab or when doing ctrl + click.
Closes #19050
**Before**
**After**
See merge request !4891
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/tree.js.coffee | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index dc6821fd42d..764df7cf55a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -24,6 +24,9 @@ v 8.10.0 (unreleased) - Allow [ci skip] to be in any case and allow [skip ci]. !4785 (simon_w) - Add basic system information like memory and disk usage to the admin panel +v 8.9.4 (unreleased) + - Fixes middle click and double request when navigating through the file browser !4891 + v 8.9.3 - Fix encrypted data backwards compatibility after upgrading attr_encrypted gem. !4963 - Fix rendering of commit notes. !4953 diff --git a/app/assets/javascripts/tree.js.coffee b/app/assets/javascripts/tree.js.coffee index de8eebcd0b2..83de584f2d9 100644 --- a/app/assets/javascripts/tree.js.coffee +++ b/app/assets/javascripts/tree.js.coffee @@ -5,9 +5,15 @@ class @TreeView # Code browser tree slider # Make the entire tree-item row clickable, but not if clicking another link (like a commit message) $(".tree-content-holder .tree-item").on 'click', (e) -> - if (e.target.nodeName != "A") - path = $('.tree-item-file-name a', this).attr('href') - Turbolinks.visit(path) + $clickedEl = $(e.target) + path = $('.tree-item-file-name a', this).attr('href') + + if not $clickedEl.is('a') and not $clickedEl.is('.str-truncated') + if e.metaKey or e.which is 2 + e.preventDefault() + window.open path, '_blank' + else + Turbolinks.visit path # Show the "Loading commit data" for only the first element $('span.log_loading:first').removeClass('hide') |