diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-02-24 22:59:36 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-02-24 22:59:36 +0000 |
| commit | 34ba39b948eadb3215324bb551c417ea05038df2 (patch) | |
| tree | 960c80157a9349777db82b5cc74e6234a02d9ca4 | |
| parent | 83ba37e54489268a8c52e158734c13b5976c7dc3 (diff) | |
| parent | ccabbaa9b348ed839e4cfb12427671676bc15c8a (diff) | |
| download | gitlab-ce-34ba39b948eadb3215324bb551c417ea05038df2.tar.gz | |
Merge branch 'bugfix/jschatz/sidebar-issues/minimize-on-diff' into 'master'
Shrink on diff view
* Shrinks when navigating to diff view.
* Shrinks when refreshing on diff view.
* Expandable at anytime.
See merge request !2735
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.coffee | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 367bd098bfd..0651bd20d26 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -210,7 +210,7 @@ $ -> $this = $(this) $this.attr 'value', $this.val() return - + $(document) .off 'keyup', 'input[type="search"]' .on 'keyup', 'input[type="search"]' , (e) -> @@ -253,7 +253,7 @@ $ -> $('.page-with-sidebar') .removeClass('right-sidebar-collapsed') .addClass('right-sidebar-expanded') - $.cookie("collapsed_gutter", + $.cookie("collapsed_gutter", $('.right-sidebar') .hasClass('right-sidebar-collapsed'), { path: '/' }) diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index 6f569f9e1aa..40cfa59a229 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -70,6 +70,7 @@ class @MergeRequestTabs @loadCommits($target.attr('href')) else if action == 'diffs' @loadDiff($target.attr('href')) + @shrinkView() else if action == 'builds' @loadBuilds($target.attr('href')) @@ -185,3 +186,14 @@ class @MergeRequestTabs expandViewContainer: -> $('.container-fluid').removeClass('container-limited') + + shrinkView: -> + $gutterIcon = $('.gutter-toggle i') + + # Wait until listeners are set + setTimeout( -> + # Only when sidebar is collapsed + if $gutterIcon.is('.fa-angle-double-right') + $gutterIcon.closest('a').trigger('click') + , 0) + |