diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-06-11 21:30:09 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-06-11 21:30:09 +0000 |
| commit | 2a29f910592e82d8f8d108e15497dd2fbbbb07ca (patch) | |
| tree | 5040bc058e3842f1c34402a0a7725e5f2521b4c3 | |
| parent | 9bf141cf718ab9ca770c3bd6b7e2c6719cbe9da7 (diff) | |
| parent | 3130572f923770cd919e29e3f6e4f6cddd22ee68 (diff) | |
| download | gitlab-ce-2a29f910592e82d8f8d108e15497dd2fbbbb07ca.tar.gz | |
Merge branch 'fe-fix-gl-dropdown-scrolling-to-top' into 'master'
Fix gl_dropdown scrolling to top on assignee click
See merge request gitlab-org/gitlab-ce!29500
| -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 05f34391323..bdb50606a53 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -567,7 +567,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 |