summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2016-01-19 12:48:35 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2016-01-19 12:48:35 +0000
commit425f8d6f572a3ae47c971a48bfefc9907c7bda55 (patch)
tree005aba38b27911d5ed238f7a9690c5fe3aa6afa8 /app/views
parentf6e14431a0676708590ddb7cb7567e1f7e97c244 (diff)
parent19608d3ee027efb27ecf83671a85487040287619 (diff)
downloadgitlab-ce-425f8d6f572a3ae47c971a48bfefc9907c7bda55.tar.gz
Merge branch 'fix/artifacts-double-propagation' into 'master'
Fix double request issue in artifacts browser This fixed problem with double propagation when clicking a link that lies inside tr with clicked event attached. See merge request !2496
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/artifacts/browse.html.haml6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/artifacts/browse.html.haml b/app/views/projects/artifacts/browse.html.haml
index 9dc7b2c2e1f..b70c776a2b2 100644
--- a/app/views/projects/artifacts/browse.html.haml
+++ b/app/views/projects/artifacts/browse.html.haml
@@ -23,6 +23,10 @@
.center Empty
:javascript
- $(document).on('click', 'tr[data-link]', function(e) {
+ $('.tree-holder').on('click', 'tr[data-link] a', function(e) {
+ e.stopImmediatePropagation();
+ });
+
+ $('.tree-holder').on('click', 'tr[data-link]', function(e) {
window.location = this.dataset.link;
});