diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-15 00:49:27 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-15 00:49:27 +0000 |
| commit | 8fddde5b9f97feaa0c62f8c4a3e5441d20989165 (patch) | |
| tree | 313c5d4aa0c540f72a6da07fb5b5d13b87ccfc0f /app/assets | |
| parent | 2a3127d05fd563138816e2451879f0fb8ffc9839 (diff) | |
| parent | f97c1d1001a1c16ab51fb62723f30f6ffa467d4f (diff) | |
| download | gitlab-ce-8fddde5b9f97feaa0c62f8c4a3e5441d20989165.tar.gz | |
Merge branch '29414-fix-toggle-disccusion-link-jump-pick-into-9-0' into 'master'
Fix link togglers jumping to top
Closes #29414
See merge request !9943
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/behaviors/toggler_behavior.js | 7 |
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 |