summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-08-31 19:22:12 +0000
committerRobert Speicher <robert@gitlab.com>2016-08-31 19:22:12 +0000
commit44a16ebf4999e79e25747743cc5138e31fa59ad6 (patch)
tree0ea8f4141f0c6dea8f78168fedee6244d3966fc2 /app/assets
parentc931745cca40db83489c7e2dcb997e0d44493934 (diff)
parent3a575d1479512fc25ec963af0b01f1f24fd64181 (diff)
downloadgitlab-ce-44a16ebf4999e79e25747743cc5138e31fa59ad6.tar.gz
Merge branch 'patch-3' into 'master'
Fix toggler_behavior.js to toggle ajax loaded contents like `diffs` page. ## What does this MR do? Fix toggle in diffs ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21676, https://gitlab.com/gitlab-org/gitlab-ce/issues/21686. See merge request !6119
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/behaviors/toggler_behavior.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/behaviors/toggler_behavior.js b/app/assets/javascripts/behaviors/toggler_behavior.js
index 8ac1ba7665e..5467e3edc69 100644
--- a/app/assets/javascripts/behaviors/toggler_behavior.js
+++ b/app/assets/javascripts/behaviors/toggler_behavior.js
@@ -1,6 +1,6 @@
(function(w) {
$(function() {
- $('.js-toggle-button').on('click', function(e) {
+ $('body').on('click', '.js-toggle-button', function(e) {
e.preventDefault();
$(this)
.find('.fa')