summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-06-23 18:36:30 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-06-29 16:49:48 -0500
commit6c9f5a50e99d60b37512a584d3888f5737675921 (patch)
tree4cf0901842cc8951ea3a79147fd58b8600e335f1
parent65187efa5c7202e8b6429edfd17ad844cd584a32 (diff)
downloadgitlab-ce-6c9f5a50e99d60b37512a584d3888f5737675921.tar.gz
Skip element that is wrapped by a link
This fixes the double request being made to the same URL
-rw-r--r--app/assets/javascripts/tree.js.coffee4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/tree.js.coffee b/app/assets/javascripts/tree.js.coffee
index de8eebcd0b2..f51cb47b6c9 100644
--- a/app/assets/javascripts/tree.js.coffee
+++ b/app/assets/javascripts/tree.js.coffee
@@ -5,7 +5,9 @@ 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")
+ $clickedEl = $(e.target)
+
+ if not $clickedEl.is('a') and not $clickedEl.is('.str-truncated')
path = $('.tree-item-file-name a', this).attr('href')
Turbolinks.visit(path)