diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-20 16:18:44 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-04-21 10:00:12 +0000 |
| commit | 6f11c35ab156dc3b0847587c83cbbd525374a721 (patch) | |
| tree | 9b867a546059974f76050f89f55dc5c63ffe0193 | |
| parent | 808038be36289ef20f3e2ae8f0e79df32b96df6e (diff) | |
| download | gitlab-ce-6f11c35ab156dc3b0847587c83cbbd525374a721.tar.gz | |
Merge branch 'edit-link-anchor-stop' into 'master'
Fixed issue with sidebar edit links toggling anchor
This caused an issue with the page scrolling from the bottom to the top. Also stopped the dropdown links doing the same.
See merge request !3819
| -rw-r--r-- | app/assets/javascripts/issuable_context.js.coffee | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/app/assets/javascripts/issuable_context.js.coffee b/app/assets/javascripts/issuable_context.js.coffee index 2f19513a831..9ae0cd06039 100644 --- a/app/assets/javascripts/issuable_context.js.coffee +++ b/app/assets/javascripts/issuable_context.js.coffee @@ -9,21 +9,30 @@ class @IssuableContext $(".issuable-sidebar .inline-update").on "change", ".js-assignee", -> $(this).submit() - $(document).off("click", ".edit-link").on "click",".edit-link", (e) -> - $block = $(@).parents('.block') - $selectbox = $block.find('.selectbox') - if $selectbox.is(':visible') - $selectbox.hide() - $block.find('.value').show() - else - $selectbox.show() - $block.find('.value').hide() - - if $selectbox.is(':visible') - setTimeout (-> - $block.find('.dropdown-menu-toggle').trigger 'click' - ), 0 - + $(document) + .off 'click', '.dropdown-content a' + .on 'click', '.dropdown-content a', (e) -> + e.preventDefault() + + $(document) + .off 'click', '.edit-link' + .on 'click', '.edit-link', (e) -> + e.preventDefault() + + $block = $(@).parents('.block') + $selectbox = $block.find('.selectbox') + if $selectbox.is(':visible') + $selectbox.hide() + $block.find('.value').show() + else + $selectbox.show() + $block.find('.value').hide() + + if $selectbox.is(':visible') + setTimeout -> + $block.find('.dropdown-menu-toggle').trigger 'click' + , 0 + $(".right-sidebar").niceScroll() |