From 8dc78c66850f29f50731a76155cce93c546023da Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Thu, 18 Feb 2016 16:15:50 -0500 Subject: Expand view container if diff mode is set to paralells --- app/assets/javascripts/merge_request_tabs.js.coffee | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index b10e1db7f3f..321feb63b0d 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -146,6 +146,7 @@ class @MergeRequestTabs success: (data) => document.querySelector("div#diffs").innerHTML = data.html $('div#diffs .js-syntax-highlight').syntaxHighlight() + @expandViewContainer() if @diffViewMode() is 'parallel' @diffsLoaded = true @scrollToElement("#diffs") @@ -177,3 +178,10 @@ class @MergeRequestTabs options = $.extend({}, defaults, options) $.ajax(options) + + diffViewMode: -> + btnID = $('a[id$="-diff-btn"].active').attr('id') + btnID.substr(0, btnID.indexOf('-')) + + expandViewContainer: -> + $('.container-fluid').removeClass('container-limited') -- cgit v1.2.1 From a2b0e86a21ec793de77bb19b6520b6b4ce6ada7f Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Thu, 18 Feb 2016 16:16:32 -0500 Subject: Add missing class to builds page --- app/helpers/nav_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index 29cb753e62c..5d86bd490a8 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -23,6 +23,7 @@ module NavHelper if current_path?('merge_requests#show') || current_path?('merge_requests#diffs') || current_path?('merge_requests#commits') || + current_path?('merge_requests#builds') || current_path?('issues#show') if cookies[:collapsed_gutter] == 'true' "page-gutter right-sidebar-collapsed" -- cgit v1.2.1 From ebceae3ead42d3558ac5a4b2ec36c06fb065ce93 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Fri, 19 Feb 2016 12:52:45 -0500 Subject: Add comment --- app/assets/javascripts/merge_request_tabs.js.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index 321feb63b0d..69258be5f2f 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -180,6 +180,8 @@ class @MergeRequestTabs $.ajax(options) diffViewMode: -> + # Gets diff view mode based from its ID + # See diff_btn helper method btnID = $('a[id$="-diff-btn"].active').attr('id') btnID.substr(0, btnID.indexOf('-')) -- cgit v1.2.1 From 27a0310f2301422d72cb50f17ded629171962c32 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Fri, 19 Feb 2016 16:32:29 -0500 Subject: Make diff view name getter less error prone --- app/assets/javascripts/merge_request_tabs.js.coffee | 6 ++---- app/helpers/diff_helper.rb | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index 69258be5f2f..e46fd98a05d 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -179,11 +179,9 @@ class @MergeRequestTabs $.ajax(options) + # Returns diff view type diffViewMode: -> - # Gets diff view mode based from its ID - # See diff_btn helper method - btnID = $('a[id$="-diff-btn"].active').attr('id') - btnID.substr(0, btnID.indexOf('-')) + $('.diffs a[id$="-diff-btn"].active').data('view-type') expandViewContainer: -> $('.container-fluid').removeClass('container-limited') diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index 6a3ab3ea40a..cea18e7c082 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -137,7 +137,7 @@ module DiffHelper # Always use HTML to handle case where JSON diff rendered this button params_copy.delete(:format) - link_to url_for(params_copy), id: "#{name}-diff-btn", class: (selected ? 'btn active' : 'btn') do + link_to url_for(params_copy), id: "#{name}-diff-btn", class: (selected ? 'btn active' : 'btn'), data: {view_type: name} do title end end -- cgit v1.2.1 From 9a60bd54a52c75572856f072dcb7a190113a679c Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Fri, 19 Feb 2016 16:34:20 -0500 Subject: Change method name for consistency --- app/assets/javascripts/merge_request_tabs.js.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index e46fd98a05d..4f2671447ef 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -146,7 +146,7 @@ class @MergeRequestTabs success: (data) => document.querySelector("div#diffs").innerHTML = data.html $('div#diffs .js-syntax-highlight').syntaxHighlight() - @expandViewContainer() if @diffViewMode() is 'parallel' + @expandViewContainer() if @diffViewType() is 'parallel' @diffsLoaded = true @scrollToElement("#diffs") @@ -180,7 +180,7 @@ class @MergeRequestTabs $.ajax(options) # Returns diff view type - diffViewMode: -> + diffViewType: -> $('.diffs a[id$="-diff-btn"].active').data('view-type') expandViewContainer: -> -- cgit v1.2.1 From 84d1b350d41b45b2384be23e58a2bf6af2b9c530 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Fri, 19 Feb 2016 17:20:39 -0500 Subject: Fixes syntax error --- app/helpers/diff_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index cea18e7c082..d76db867c5a 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -137,7 +137,7 @@ module DiffHelper # Always use HTML to handle case where JSON diff rendered this button params_copy.delete(:format) - link_to url_for(params_copy), id: "#{name}-diff-btn", class: (selected ? 'btn active' : 'btn'), data: {view_type: name} do + link_to url_for(params_copy), id: "#{name}-diff-btn", class: (selected ? 'btn active' : 'btn'), data: { view_type: name } do title end end -- cgit v1.2.1 From cd569a66ef07a88923de0f500d055f00ab598d38 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Fri, 19 Feb 2016 20:01:30 -0500 Subject: Update button selector --- app/assets/javascripts/merge_request_tabs.js.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index 4f2671447ef..6f569f9e1aa 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -181,7 +181,7 @@ class @MergeRequestTabs # Returns diff view type diffViewType: -> - $('.diffs a[id$="-diff-btn"].active').data('view-type') + $('.inline-parallel-buttons a.active').data('view-type') expandViewContainer: -> $('.container-fluid').removeClass('container-limited') -- cgit v1.2.1