Commit c254cb03 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix affix for issue and merge request with image in description

parent e993b59b
...@@ -16,8 +16,9 @@ class @Issue ...@@ -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)
...@@ -20,11 +20,12 @@ class @MergeRequest ...@@ -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) ->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment