Sort out scroll in chat

services/web/app/coffee/Features/Chat/ChatController.coffee

@@ -18,7 +18,7 @@ module.exports =
 
 	getMessages: (req, res)->
 		project_id = req.params.Project_id
-		query = req.body
+		query = req.query
 		logger.log project_id:project_id, query:query, "getting messages"
 		ChatHandler.getMessages project_id, query, (err, messages)->
 			if err?

services/web/app/views/project/editor.jade

@@ -61,7 +61,7 @@ block content
 						include ./editor/track-changes
 
 			.ui-layout-east
-				//- include ./editor/chat
+				include ./editor/chat
 
 	script(type="text/ng-template", id="genericMessageModalTemplate")
 		.modal-header
@@ -118,4 +118,5 @@ block content
 		data-ace-base=jsPath+'ace',
 		src=jsPath+'libs/require.js?fingerprint='+fingerprint(jsPath + 'libs/require.js')
 	)
+		
 

services/web/app/views/project/editor/chat.jade

@@ -1,24 +1,25 @@
 aside.chat(
 	ng-controller="ChatController"
-	infinite-scroll="loadMore()"
-	infinite-scroll-disabled="chat.loading || chat.atEnd"
-	infinite-scroll-initialize="ui.chatOpen"
 )
 	.messages(
-		infinite-scroll="loadMore()"
+		infinite-scroll="loadMoreMessages()"
 		infinite-scroll-disabled="chat.loading || chat.atEnd"
 		infinite-scroll-initialize="ui.chatOpen"
-		scroll-glue
+		infinite-scroll-upwards="true"
+		update-scroll-bottom-on="messages:updated"
 	)
 		.infinite-scroll-inner
+			.loading(ng-show="chat.loading")
+				i.fa.fa-fw.fa-spin.fa-refresh
+				| Loading...
 			ul.list-unstyled
 				li.message(
-					ng-repeat="message in chat.groupedMessages | orderBy:'timestamp':false"
+					ng-repeat="message in chat.messages"
 					ng-controller="ChatMessageController"
 					ng-class="{'self': message.user.id == user.id }"
 				)
-					div.date(ng-if="$index == 0 || (message.timestamp - chat.groupedMessages[$index - 1].timestamp) > 5 * 60 * 1000")
-						{{ message.timestamp | formatDate:'h:MMa' }} {{ message.timestamp | relativeDate }}
+					div.date(ng-if="$index == 0 || (message.timestamp - chat.messages[$index - 1].timestamp) > 5 * 60 * 1000")
+						{{ message.timestamp | formatDate:'h:mm a' }} {{ message.timestamp | relativeDate }}
 					span.avatar
 						img(ng-src="{{message.user.gravatar_url}}")
 					div.message-wrapper
@@ -30,7 +31,7 @@ aside.chat(
 							}"
 						)
 							.arrow(ng-style="{'border-color': 'hsl({{ hue(message.user) }}, 60%, 80%)'}")
-							p(ng-repeat="content in message.contents") {{ content }}
+							p(ng-repeat="content in message.contents track by $index") {{ content }}
 
 	.new-message
 		textarea(placeholder="Your message...", on-enter="sendMessage()", ng-model="newMessageContent")

services/web/app/views/project/editor/header.jade

@@ -50,12 +50,12 @@ header.toolbar.toolbar-header(ng-cloak, ng-hide="state.loading")
 			tooltip-placement="bottom"
 		)
 			i.fa.fa-fw.fa-history
-		//- a.btn.btn-full-height(
-		//- 	href,
-		//- 	tooltip="Chat",
-		//- 	tooltip-placement="bottom",
-		//- 	ng-class="{ active: ui.chatOpen }",
-		//- 	ng-click="toggleChat()",
-		//- 	ng-controller="ChatButtonController"
-		//- )
-		//- 	i.fa.fa-fw.fa-comment
+		a.btn.btn-full-height(
+			href,
+			tooltip="Chat",
+			tooltip-placement="bottom",
+			ng-class="{ active: ui.chatOpen }",
+			ng-click="toggleChat()",
+			ng-controller="ChatButtonController"
+		)
+			i.fa.fa-fw.fa-comment