diff options
-rw-r--r-- | app/assets/javascripts/application.js.coffee | 10 | ||||
-rw-r--r-- | app/helpers/nav_helper.rb | 16 |
2 files changed, 26 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 367bd098bfd..d1bef0bd151 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -226,6 +226,16 @@ $ -> $gutterIcon.closest('a').trigger('click') $(document) + .off 'shown.bs.tab', '.merge-request-tabs a[data-toggle="tab"]' + .on 'shown.bs.tab', '.merge-request-tabs a[data-toggle="tab"]', (e) -> + action = $(e.target).attr("data-action") + if action is 'diffs' + $gutterIcon = $('.gutter-toggle').find('i') + if $gutterIcon.hasClass('fa-angle-double-right') + $gutterIcon.closest('a').trigger('click') + + + $(document) .off 'click', 'aside .gutter-toggle' .on 'click', 'aside .gutter-toggle', (e) -> e.preventDefault() diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index 29cb753e62c..921912ce802 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -3,6 +3,20 @@ module NavHelper cookies[:collapsed_nav] == 'true' end + def sidebar_gutter_collapsed_class + if current_path?('merge_requests#diffs') || + cookies[:collapsed_gutter] == 'true' + "right-sidebar-collapsed" + else + "right-sidebar-expanded" + end + end + + def sidebar_gutter_collapsed? + current_path?('merge_requests#diffs') || + cookies[:collapsed_gutter] == 'true' + end + def nav_sidebar_class if nav_menu_collapsed? "sidebar-collapsed" @@ -29,6 +43,8 @@ module NavHelper else "page-gutter right-sidebar-expanded" end + elsif current_path?('merge_requests#diffs') + "page-gutter right-sidebar-collapsed" end end |