kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Trigger sticky_kit:recalc when diffs are pre-loaded

This commit is contained in:
Robert Speicher 2015-06-25 21:26:20 -04:00
parent 4e7f23fe0b
commit d2b5c3f6ce
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/merge_request_tabs.js.coffee
View File

@ -50,8 +50,10 @@ class @MergeRequestTabs
@_location = location @_location = location
switch @opts.action switch @opts.action
when 'commits' then @commitsLoaded = true when 'commits'
when 'diffs' then @diffsLoaded = true @commitsLoaded = true
when 'diffs'
@diffsLoaded = true
@bindEvents() @bindEvents()
@activateTab(@opts.action) @activateTab(@opts.action)
@ -67,6 +69,7 @@ class @MergeRequestTabs
@loadCommits($target.attr('href')) @loadCommits($target.attr('href'))
else if action == 'diffs' else if action == 'diffs'
@loadDiff($target.attr('href')) @loadDiff($target.attr('href'))
@stickyDiffHeaders()
@setCurrentAction(action) @setCurrentAction(action)
@ -134,12 +137,15 @@ class @MergeRequestTabs
url: "#{source}.json" url: "#{source}.json"
success: (data) => success: (data) =>
document.getElementById('diffs').innerHTML = data.html document.getElementById('diffs').innerHTML = data.html
$('.diff-header').trigger('sticky_kit:recalc') @stickyDiffHeaders()
@diffsLoaded = true @diffsLoaded = true
toggleLoading: -> toggleLoading: ->
$('.mr-loading-status .loading').toggle() $('.mr-loading-status .loading').toggle()
stickyDiffHeaders: ->
$('.diff-header').trigger('sticky_kit:recalc')
_get: (options) -> _get: (options) ->
defaults = { defaults = {
beforeSend: @toggleLoading beforeSend: @toggleLoading