diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-06-11 21:30:09 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-06-26 10:04:53 +0000 |
| commit | 6e70885a70608bbce4f15c8cccb1b4d4d62006ab (patch) | |
| tree | 2497d68a2a03dc017502bbf30df12a04efc17f20 | |
| parent | e3bb5f49e09621e57b6afcccc6844cd4f13b3888 (diff) | |
| download | gitlab-ce-11-11-stable-patch-4.tar.gz | |
Merge branch 'fe-fix-gl-dropdown-scrolling-to-top' into 'master'11-11-stable-patch-4
Fix gl_dropdown scrolling to top on assignee click
See merge request gitlab-org/gitlab-ce!29500
(cherry picked from commit 2a29f910592e82d8f8d108e15497dd2fbbbb07ca)
3130572f Fix gl_dropdown scrolling to top on assignee click
| -rw-r--r-- | app/assets/javascripts/gl_dropdown.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fe-fix-gl-dropdown-scrolling-to-top.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js index e52bc8583c6..7ac947c9836 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -563,7 +563,7 @@ GitLabDropdown = (function() { e.stopPropagation(); // This prevents automatic scrolling to the top - if ($target.is('a')) { + if ($target.closest('a').length) { return false; } } diff --git a/changelogs/unreleased/fe-fix-gl-dropdown-scrolling-to-top.yml b/changelogs/unreleased/fe-fix-gl-dropdown-scrolling-to-top.yml new file mode 100644 index 00000000000..4125b4241e6 --- /dev/null +++ b/changelogs/unreleased/fe-fix-gl-dropdown-scrolling-to-top.yml @@ -0,0 +1,5 @@ +--- +title: Fix scrolling to top on assignee change +merge_request: 29500 +author: +type: fixed |