Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Article View

Browse source 
- remeasure see-more when images got loaded, see #950
- add top-margin to attachments
This commit is contained in:
Felix Niklas 2017-04-27 12:26:27 +02:00 committed by Thorsten Eckel
parent b1f0ed6239
commit d7696f000b
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee
View file

@ -73,6 +73,7 @@ class ArticleViewItem extends App.ObserverController
elements: elements:
'.textBubble-content': 'textBubbleContent' '.textBubble-content': 'textBubbleContent'
'.textBubble-content img': 'textBubbleImages'
'.textBubble-overflowContainer': 'textBubbleOverflowContainer' '.textBubble-overflowContainer': 'textBubbleOverflowContainer'
events: events:
@ -209,6 +210,13 @@ class ArticleViewItem extends App.ObserverController
return if @shown return if @shown
@shown = true @shown = true
@textBubbleImages.each (i, el) =>
if !el.complete
$(el).one 'load', @measureSeeMore
@measureSeeMore()
measureSeeMore: =>
maxHeight = 560 maxHeight = 560
minHeight = 90 minHeight = 90
bubbleContent = @textBubbleContent bubbleContent = @textBubbleContent

2
app/assets/stylesheets/zammad.scss
View file

@ -4763,7 +4763,7 @@ footer {
.attachments.attachments--list:not(:empty) { .attachments.attachments--list:not(:empty) {
border-top: 1px solid rgba(0,0,0,.04); border-top: 1px solid rgba(0,0,0,.04);
white-space: normal; white-space: normal;
margin: 0 -20px; margin: 10px -20px 0;
padding: 26px 20px 7px 72px; padding: 26px 20px 7px 72px;
position: relative; position: relative;
} }