summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Slaughter <pslaughter@gitlab.com>2019-06-05 06:04:33 -0500
committerPaul Slaughter <pslaughter@gitlab.com>2019-06-05 06:16:50 -0500
commitaef781c132d8fc6eab10681399a823e5cd537760 (patch)
tree5e9cbf6ee441dce5d4611cbdc289b6c523d06d8f
parent2b7fb50f5d2015e11a78c0ff60d0f9ac8b7776aa (diff)
downloadgitlab-ce-61246-fix-label-click-scroll-to-top.tar.gz
Fix label click scrolling to top61246-fix-label-click-scroll-to-top
-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