diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-24 15:39:56 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-24 15:39:56 -0500 |
| commit | 4d23af7507e4f7f82de07d8274b85dccc0a62536 (patch) | |
| tree | 6223188ce81382c27697b4626de62460de4d3f4c /app | |
| parent | a4e522a889b24d7d7768ac3b77d0b544a25c3782 (diff) | |
| download | gitlab-ce-4d23af7507e4f7f82de07d8274b85dccc0a62536.tar.gz | |
Move script inside of MergeRequestTabs class
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 14 | ||||
| -rw-r--r-- | 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) -> @@ -226,16 +226,6 @@ $ -> $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() @@ -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') |