diff options
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.coffee | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index 918936a9eb9..5dc441f64b5 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -50,8 +50,10 @@ class @MergeRequestTabs @_location = location switch @opts.action - when 'commits' then @commitsLoaded = true - when 'diffs' then @diffsLoaded = true + when 'commits' + @commitsLoaded = true + when 'diffs' + @diffsLoaded = true @bindEvents() @activateTab(@opts.action) @@ -67,6 +69,7 @@ class @MergeRequestTabs @loadCommits($target.attr('href')) else if action == 'diffs' @loadDiff($target.attr('href')) + @stickyDiffHeaders() @setCurrentAction(action) @@ -134,12 +137,15 @@ class @MergeRequestTabs url: "#{source}.json" success: (data) => document.getElementById('diffs').innerHTML = data.html - $('.diff-header').trigger('sticky_kit:recalc') + @stickyDiffHeaders() @diffsLoaded = true toggleLoading: -> $('.mr-loading-status .loading').toggle() + stickyDiffHeaders: -> + $('.diff-header').trigger('sticky_kit:recalc') + _get: (options) -> defaults = { beforeSend: @toggleLoading |