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

Fix affix for issue and merge request with image in description

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2015-02-25 20:00:28 -08:00
parent e993b59b7d
commit c254cb03d8
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/issue.js.coffee
View file

@ -16,8 +16,9 @@ class @Issue
updateTaskState updateTaskState
) )
$('.issuable-affix').affix offset: $('.issue-details').waitForImages ->
top: -> $('.issuable-affix').affix offset:
@top = $('.issue-details').outerHeight(true) + 25 top: ->
bottom: -> @top = $('.issue-details').outerHeight(true) + 25
@bottom = $('.footer').outerHeight(true) bottom: ->
@bottom = $('.footer').outerHeight(true)

11
app/assets/javascripts/merge_request.js.coffee
View file

@ -20,11 +20,12 @@ class @MergeRequest
if $("a.btn-close").length if $("a.btn-close").length
$("li.task-list-item input:checkbox").prop("disabled", false) $("li.task-list-item input:checkbox").prop("disabled", false)
$('.issuable-affix').affix offset: $('.merge-request-details').waitForImages ->
top: -> $('.issuable-affix').affix offset:
@top = $('.merge-request-details').outerHeight(true) + 70 top: ->
bottom: -> @top = $('.merge-request-details').outerHeight(true) + 91
@bottom = $('.footer').outerHeight(true) bottom: ->
@bottom = $('.footer').outerHeight(true)
# Local jQuery finder # Local jQuery finder
$: (selector) -> $: (selector) ->