summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-03-14 11:47:05 -0500
committerLin Jen-Shin <godfat@godfat.org>2017-03-16 17:19:00 +0800
commit4d40e9cca8a4b597080c3042ab74401f44a58985 (patch)
tree4ec2e603b01058a9c37c3d4d26280fb308222d0f
parent5c91f9221d33d4ab6b221230f77ac089f2adc027 (diff)
downloadgitlab-ce-4d40e9cca8a4b597080c3042ab74401f44a58985.tar.gz
Fix link togglers jumping to top
Fix #29414
-rw-r--r--app/assets/javascripts/behaviors/toggler_behavior.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/behaviors/toggler_behavior.js b/app/assets/javascripts/behaviors/toggler_behavior.js
index 0726c6c9636..92f3bb3ff52 100644
--- a/app/assets/javascripts/behaviors/toggler_behavior.js
+++ b/app/assets/javascripts/behaviors/toggler_behavior.js
@@ -21,8 +21,13 @@
// %a.js-toggle-button
// %div.js-toggle-content
//
- $('body').on('click', '.js-toggle-button', function() {
+ $('body').on('click', '.js-toggle-button', function(e) {
toggleContainer($(this).closest('.js-toggle-container'));
+
+ const targetTag = e.target.tagName.toLowerCase();
+ if (targetTag === 'a' || targetTag === 'button') {
+ e.preventDefault();
+ }
});
// If we're accessing a permalink, ensure it is not inside a