summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2019-06-05 15:20:11 +0000
committerFatih Acet <acetfatih@gmail.com>2019-06-05 15:20:11 +0000
commit92b06c13bd12abf85f6beb18b3b5c2f0e38c2760 (patch)
tree0732b2f405c14b43f884e505d4de210ab638d9fb
parent422fa21d0a7a4f7dd36ccb42e484c721398558b0 (diff)
parentc9c7fa7bbbbecf8d6af0936d7004c2d9469aed78 (diff)
downloadgitlab-ce-92b06c13bd12abf85f6beb18b3b5c2f0e38c2760.tar.gz
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
-rw-r--r--app/assets/javascripts/gl_dropdown.js5
-rw-r--r--changelogs/unreleased/61246-fix-label-click-scroll-to-top.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js
index 18fa6265108..05f34391323 100644
--- a/app/assets/javascripts/gl_dropdown.js
+++ b/app/assets/javascripts/gl_dropdown.js
@@ -565,6 +565,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