Store messages in $rootScope so they can be accessed from multiple controllers without duplicated storage for each. This also gives updates.

1 files changed, 1 insertions, 6 deletions

diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index 301d3d6447..4c5415eace 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -28,7 +28,6 @@ angular.module('RoomController', [])
         can_paginate: true, // this is toggled off when we run out of items
         stream_failure: undefined // the response when the stream fails
     };
-    $scope.messages = [];
     $scope.members = {};
     $scope.stopPoll = false;
 
@@ -43,13 +42,9 @@ angular.module('RoomController', [])
     };
     
     $scope.$on(eventHandlerService.MSG_EVENT, function(ngEvent, event, isLive) {
-        if (isLive) {
-            $scope.messages.push(event);
+        if (isLive && event.room_id === $scope.room_id) {
             scrollToBottom();
         }
-        else {
-            $scope.messages.unshift(event);
-        }
     });
     
     $scope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) {