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

customer chat: add scroll snap tolerance

Browse source
This commit is contained in:
Felix Niklas 2016-07-04 16:20:59 +02:00
parent f62796ab9e
commit 74b9e60ad6
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/app/controllers/chat.coffee
View file

@ -367,6 +367,7 @@ class ChatWindow extends App.Controller
@isAgentTyping = false @isAgentTyping = false
@resetUnreadMessages() @resetUnreadMessages()
@scrolledToBottom = true @scrolledToBottom = true
@scrollSnapTolerance = 10 # pixels
@chat = App.Chat.find(@session.chat_id) @chat = App.Chat.find(@session.chat_id)
@name = "#{@chat.displayName()} ##{@session.id}" @name = "#{@chat.displayName()} ##{@session.id}"
@ -682,7 +683,7 @@ class ChatWindow extends App.Controller
detectScrolledtoBottom: => detectScrolledtoBottom: =>
scrollBottom = @scrollHolder.scrollTop() + @scrollHolder.height() scrollBottom = @scrollHolder.scrollTop() + @scrollHolder.height()
@scrolledToBottom = scrollBottom == @scrollHolder.prop('scrollHeight') @scrolledToBottom = Math.abs(scrollBottom - @scrollHolder.prop('scrollHeight')) <= @scrollSnapTolerance
onScrollHintClick: -> onScrollHintClick: ->
# animate scroll # animate scroll

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

@ -7833,7 +7833,7 @@ output {
.chat-footer { .chat-footer {
border-top: 1px solid hsl(0,0%,93%); border-top: 1px solid hsl(0,0%,93%);
padding: 10px; padding: 10px 10px 0;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-self: stretch; align-self: stretch;