From 2fd5622ea0aaa5151660b7b5229df264e6bdd9da Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Wed, 5 Jun 2019 15:20:11 +0000 Subject: [PATCH] Merge branch '61246-fix-label-click-scroll-to-top' into 'master' Fix label click scrolling to top Closes #61246 See merge request gitlab-org/gitlab-ce!29202 (cherry picked from commit 92b06c13bd12abf85f6beb18b3b5c2f0e38c2760) c9c7fa7b Fix label click scrolling to top --- app/assets/javascripts/gl_dropdown.js | 5 +++++ .../unreleased/61246-fix-label-click-scroll-to-top.yml | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 changelogs/unreleased/61246-fix-label-click-scroll-to-top.yml diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js index 1c6b18c0e03..e52bc8583c6 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -561,6 +561,11 @@ GitLabDropdown = (function() { !$target.data('isLink') ) { e.stopPropagation(); + + // This prevents automatic scrolling to the top + if ($target.is('a')) { + return false; + } } return true; diff --git a/changelogs/unreleased/61246-fix-label-click-scroll-to-top.yml b/changelogs/unreleased/61246-fix-label-click-scroll-to-top.yml new file mode 100644 index 00000000000..7fa15e1c0fd --- /dev/null +++ b/changelogs/unreleased/61246-fix-label-click-scroll-to-top.yml @@ -0,0 +1,5 @@ +--- +title: Fix label click scrolling to top +merge_request: 29202 +author: +type: fixed -- GitLab