diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-01-31 14:23:22 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-01-31 14:33:56 +0000 |
| commit | 23001910ffb10fe4e65f155d6cb5517e503a6c81 (patch) | |
| tree | 5cb461b95be723075b26384e78e54f18ba428a0f | |
| parent | 5d7cfe66702b1717fc79a56fe0cb5225a4d2a830 (diff) | |
| download | gitlab-ce-27340-issuable-sidebar-collapses-after-interaction.tar.gz | |
Fixed collapse-after-update bug27340-issuable-sidebar-collapses-after-interaction-specs27340-issuable-sidebar-collapses-after-interaction
| -rw-r--r-- | app/assets/javascripts/right_sidebar.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/right_sidebar.js b/app/assets/javascripts/right_sidebar.js index f3f35f34d59..1b0dee25563 100644 --- a/app/assets/javascripts/right_sidebar.js +++ b/app/assets/javascripts/right_sidebar.js @@ -149,7 +149,7 @@ }; RightSidebar.prototype.setCollapseAfterUpdate = function($block) { - $block.addClass('collapse-after-update'); + $block.closest('.right-sidebar').addClass('collapse-after-update'); $block.data('before-update', $('input', $block).val()); return $('.page-with-sidebar').addClass('with-overlay'); }; @@ -163,11 +163,11 @@ }; RightSidebar.prototype.sidebarDropdownHidden = function($block) { - if ($block.hasClass('collapse-after-update') && $('input', $block).val() !== $block.data('before-update')) { - $block.removeClass('collapse-after-update'); - $('.page-with-sidebar').removeClass('with-overlay'); - return this.toggleSidebar('hide'); - } + if (!$block.closest('.right-sidebar').hasClass('collapse-after-update') || + $('input', $block).val() === $block.data('before-update')) return; + $block.closest('.right-sidebar').removeClass('collapse-after-update'); + $('.page-with-sidebar').removeClass('with-overlay'); + return this.toggleSidebar('hide'); }; RightSidebar.prototype.triggerOpenSidebar = function() { |