github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Small chat scroll tweaks

Browse source
This commit is contained in:
James Allen 2014-07-16 10:52:06 +01:00
parent e0266e309f
commit 1d7a595c6c
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/views/project/editor/chat.jade
View file

@ -6,7 +6,7 @@ aside.chat(
infinite-scroll-disabled="chat.loading || chat.atEnd" infinite-scroll-disabled="chat.loading || chat.atEnd"
infinite-scroll-initialize="ui.chatOpen" infinite-scroll-initialize="ui.chatOpen"
infinite-scroll-upwards="true" infinite-scroll-upwards="true"
update-scroll-bottom-on="messages:updated" update-scroll-bottom-on="updateScrollPosition"
) )
.infinite-scroll-inner .infinite-scroll-inner
.loading(ng-show="chat.loading") .loading(ng-show="chat.loading")

4
services/web/public/coffee/directives/scroll.coffee
View file

@ -1,7 +1,7 @@
define [ define [
"base" "base"
], (App) -> ], (App) ->
App.directive "updateScrollBottomOn", -> App.directive "updateScrollBottomOn", ($timeout) ->
return { return {
restrict: "A" restrict: "A"
link: (scope, element, attrs, ctrls) -> link: (scope, element, attrs, ctrls) ->
@ -29,7 +29,7 @@ define [
scrollBottom = element[0].scrollHeight - element[0].scrollTop - element[0].clientHeight scrollBottom = element[0].scrollHeight - element[0].scrollTop - element[0].clientHeight
scope.$on attrs.updateScrollBottomOn, () -> scope.$on attrs.updateScrollBottomOn, () ->
setTimeout () -> $timeout () ->
element.scrollTop(element[0].scrollHeight - element[0].clientHeight - scrollBottom) element.scrollTop(element[0].scrollHeight - element[0].clientHeight - scrollBottom)
, 0 , 0
} }

5
services/web/public/coffee/ide/chat/controllers/ChatController.coffee
View file

@ -7,9 +7,12 @@ define [
$scope.$watch "chat.messages", (messages) -> $scope.$watch "chat.messages", (messages) ->
if messages? if messages?
$scope.$emit "messages:updated" $scope.$emit "updateScrollPosition"
, true # Deep watch , true # Deep watch
$scope.$on "layout:chat:resize", () ->
$scope.$emit "updateScrollPosition"
$scope.sendMessage = -> $scope.sendMessage = ->
chatMessages chatMessages
.sendMessage $scope.newMessageContent .sendMessage $scope.newMessageContent

1
services/web/public/coffee/ide/chat/services/chatMessages.coffee
View file

@ -34,7 +34,6 @@ define [
messages.reverse() messages.reverse()
prependMessages(messages) prependMessages(messages)
chat.state.nextBeforeTimestamp = chat.state.messages[0]?.timestamp chat.state.nextBeforeTimestamp = chat.state.messages[0]?.timestamp
console.log messages, chat.state
TIMESTAMP_GROUP_SIZE = 5 * 60 * 1000 # 5 minutes TIMESTAMP_GROUP_SIZE = 5 * 60 * 1000 # 5 minutes