From 246b2a3c3e039bd1eef447cf1e7b5f78bcce20a3 Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <erohee@amdocs.com>
Date: Thu, 28 Aug 2014 17:48:55 +0200
Subject: Renamed matrixService.assignRoomAliases into
 getRoomAliasAndDisplayName

---
 webclient/recents/recents-controller.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'webclient/recents')

diff --git a/webclient/recents/recents-controller.js b/webclient/recents/recents-controller.js
index 803ab420f9..1ead08cae8 100644
--- a/webclient/recents/recents-controller.js
+++ b/webclient/recents/recents-controller.js
@@ -53,13 +53,16 @@ angular.module('RecentsController', ['matrixService', 'eventHandlerService'])
                 // Reset data
                 $scope.rooms = {};
 
-                var data = matrixService.assignRoomAliases(response.data.rooms);
-                for (var i=0; i<data.length; i++) {
-                    $scope.rooms[data[i].room_id] = data[i];
+                var rooms = response.data.rooms;
+                for (var i=0; i<rooms.length; i++) {
+                    var room = rooms[i];
+                    
+                    // Add room_alias & room_display_name members
+                    $scope.rooms[room.room_id] = angular.extend(room, matrixService.getRoomAliasAndDisplayName(room));
 
                     // Create a shortcut for the last message of this room
-                    if (data[i].messages && data[i].messages.chunk && data[i].messages.chunk[0]) {
-                        $scope.rooms[data[i].room_id].lastMsg = data[i].messages.chunk[0];
+                    if (room.messages && room.messages.chunk && room.messages.chunk[0]) {
+                        $scope.rooms[room.room_id].lastMsg = room.messages.chunk[0];
                     }
                 }
 
-- 
cgit 1.5.1


From 9b2cb41dcf71590eab75774bc2fe1c42f9de4db1 Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <erohee@amdocs.com>
Date: Fri, 29 Aug 2014 09:49:03 +0200
Subject: Display emotes in the recents list

---
 webclient/recents/recents.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'webclient/recents')

diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html
index 6fda6c5c6b..3f025a98d8 100644
--- a/webclient/recents/recents.html
+++ b/webclient/recents/recents.html
@@ -39,6 +39,11 @@
                                     {{ room.lastMsg.user_id }} sent an image
                                 </div>
 
+                                <div ng-switch-when="m.emote">
+                                    <span ng-bind-html="'* ' + (room.lastMsg.user_id) + ' ' + room.lastMsg.content.body | linky:'_blank'">
+                                    </span>
+                                </div>
+
                                 <div ng-switch-default>
                                     {{ room.lastMsg.content }}
                                 </div>
-- 
cgit 1.5.1


From 089d1b1b78f4d98afbe1eee070da5e4ad20d6664 Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <erohee@amdocs.com>
Date: Fri, 29 Aug 2014 09:55:47 +0200
Subject: Recents update: do not care of events coming from the past (they are
 fired when doing pagination of room messages in the past)

---
 webclient/recents/recents-controller.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'webclient/recents')

diff --git a/webclient/recents/recents-controller.js b/webclient/recents/recents-controller.js
index 1ead08cae8..d33d41a922 100644
--- a/webclient/recents/recents-controller.js
+++ b/webclient/recents/recents-controller.js
@@ -29,7 +29,7 @@ angular.module('RecentsController', ['matrixService', 'eventHandlerService'])
         // Refresh the list on matrix invitation and message event
         $scope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) {
             var config = matrixService.config();
-            if (event.state_key === config.user_id && event.content.membership === "invite") {
+            if (isLive && event.state_key === config.user_id && event.content.membership === "invite") {
                 console.log("Invited to room " + event.room_id);
                 // FIXME push membership to top level key to match /im/sync
                 event.membership = event.content.membership;
@@ -39,7 +39,9 @@ angular.module('RecentsController', ['matrixService', 'eventHandlerService'])
             }
         });
         $scope.$on(eventHandlerService.MSG_EVENT, function(ngEvent, event, isLive) {
-            $scope.rooms[event.room_id].lastMsg = event;
+            if (isLive) {
+                $scope.rooms[event.room_id].lastMsg = event;              
+            }
         });
     };
 
-- 
cgit 1.5.1