From a7c11fe47361527798b41d0ee9dc344b144a3b50 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Tue, 5 Apr 2016 13:25:32 -0500 Subject: Ignore toggling sidebar for above 1200px resolution --- app/assets/javascripts/merge_request_tabs.js.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index 839e6ec2c08..e45f91c2221 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -73,7 +73,8 @@ class @MergeRequestTabs @expandView() else if action == 'diffs' @loadDiff($target.attr('href')) - @shrinkView() + if bp.getBreakpointSize() isnt 'lg' + @shrinkView() else if action == 'builds' @loadBuilds($target.attr('href')) @expandView() -- cgit v1.2.1 From fe0aa823252eb468f468c9d813fdc28687c4a4b6 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Tue, 5 Apr 2016 14:37:15 -0500 Subject: Check existence of variable method This happens because tab's `shown` event is triggered first if we enter directly to the diff page therefore Breakpoints class is not initialized yet. --- 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 e45f91c2221..3500d796d2d 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -73,7 +73,7 @@ class @MergeRequestTabs @expandView() else if action == 'diffs' @loadDiff($target.attr('href')) - if bp.getBreakpointSize() isnt 'lg' + if window.bp isnt undefined and window.bp.getBreakpointSize() isnt 'lg' @shrinkView() else if action == 'builds' @loadBuilds($target.attr('href')) -- cgit v1.2.1 From 836301676adba7a91e4539f3d0e554873f06fc99 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Tue, 5 Apr 2016 17:12:15 -0500 Subject: Use existence operator instead --- 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 3500d796d2d..9946249adbf 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -73,7 +73,7 @@ class @MergeRequestTabs @expandView() else if action == 'diffs' @loadDiff($target.attr('href')) - if window.bp isnt undefined and window.bp.getBreakpointSize() isnt 'lg' + if bp? and bp.getBreakpointSize() isnt 'lg' @shrinkView() else if action == 'builds' @loadBuilds($target.attr('href')) -- cgit v1.2.1