From 9f0a71f4fe0eade788c1c722c70873b319492dbe Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Fri, 5 Feb 2016 17:07:57 -0500 Subject: Shrink on diff view Shrinks when navigating to diff view. Shrinks when refreshing on diff view. Expandable at anytime. --- app/assets/javascripts/application.js.coffee | 10 ++++++++++ app/helpers/nav_helper.rb | 16 ++++++++++++++++ 2 files changed, 26 insertions(+) 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 @@ -225,6 +225,16 @@ $ -> if $gutterIcon.hasClass('fa-angle-double-right') $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) -> 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 -- cgit v1.2.1 From 4d23af7507e4f7f82de07d8274b85dccc0a62536 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Wed, 24 Feb 2016 15:39:56 -0500 Subject: Move script inside of MergeRequestTabs class --- app/assets/javascripts/application.js.coffee | 14 ++------------ app/assets/javascripts/merge_request_tabs.js.coffee | 8 ++++++++ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index d1bef0bd151..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) -> @@ -225,16 +225,6 @@ $ -> if $gutterIcon.hasClass('fa-angle-double-right') $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) -> @@ -263,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..e6e502cf6b6 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,10 @@ class @MergeRequestTabs expandViewContainer: -> $('.container-fluid').removeClass('container-limited') + + shrinkView: -> + $gutterIcon = $('.gutter-toggle i') + + # Only when sidebar is collapsed + if $gutterIcon.is('.fa-angle-double-right') + $gutterIcon.closest('a').trigger('click') -- cgit v1.2.1 From 7fdc29715adc34acdfe7671f3452a38b93e32392 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Wed, 24 Feb 2016 15:40:36 -0500 Subject: Remove unused methods --- app/helpers/nav_helper.rb | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index 309425559e8..5d86bd490a8 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -3,20 +3,6 @@ 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" @@ -44,8 +30,6 @@ module NavHelper else "page-gutter right-sidebar-expanded" end - elsif current_path?('merge_requests#diffs') - "page-gutter right-sidebar-collapsed" end end -- cgit v1.2.1 From ccabbaa9b348ed839e4cfb12427671676bc15c8a Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Wed, 24 Feb 2016 15:53:39 -0500 Subject: Wait until listeners are set before triggering a 'click' event --- app/assets/javascripts/merge_request_tabs.js.coffee | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index e6e502cf6b6..40cfa59a229 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -190,6 +190,10 @@ class @MergeRequestTabs shrinkView: -> $gutterIcon = $('.gutter-toggle i') - # Only when sidebar is collapsed - if $gutterIcon.is('.fa-angle-double-right') - $gutterIcon.closest('a').trigger('click') + # Wait until listeners are set + setTimeout( -> + # Only when sidebar is collapsed + if $gutterIcon.is('.fa-angle-double-right') + $gutterIcon.closest('a').trigger('click') + , 0) + -- cgit v1.2.1