diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-04 14:29:20 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-04 14:31:33 -0500 |
| commit | 9afab2963c33e935069ed88069b548d85d478f7f (patch) | |
| tree | d1734fcd8e4e206b0c339482068c43f15b295692 | |
| parent | 8835514b10871b7fa46813b194ebf3320991b8ff (diff) | |
| download | gitlab-ce-9afab2963c33e935069ed88069b548d85d478f7f.tar.gz | |
Only save right sidebar position cookie if user did the collapsing.
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 11 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.coffee | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index b2befc4273d..d372e96cc50 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -225,8 +225,8 @@ $ -> $gutterIcon.closest('a').trigger('click') $(document) - .off 'click', '.gutter-toggle' - .on 'click', '.gutter-toggle', (e) -> + .off 'click', 'aside .gutter-toggle' + .on 'click', 'aside .gutter-toggle', (e, manual) -> e.preventDefault() $this = $(this) $thisIcon = $this.find 'i' @@ -251,9 +251,10 @@ $ -> $('.page-with-sidebar') .removeClass('right-sidebar-collapsed') .addClass('right-sidebar-expanded') - $.cookie("collapsed_gutter", - $('.right-sidebar') - .hasClass('right-sidebar-collapsed'), { path: '/' }) + if not manual + $.cookie("collapsed_gutter", + $('.right-sidebar') + .hasClass('right-sidebar-collapsed'), { path: '/' }) bootstrapBreakpoint = undefined; checkBootstrapBreakpoints = -> diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index 23a218b4c7d..58373ba87a5 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -195,6 +195,6 @@ class @MergeRequestTabs setTimeout( -> # Only when sidebar is collapsed if $gutterIcon.is('.fa-angle-double-right') - $gutterIcon.closest('a').trigger('click') + $gutterIcon.closest('a').trigger('click',[true]) , 0) |