From 4e14e38bd5cad77dfcab1fdfa3d3a19250810413 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@matrix.org>
Date: Mon, 1 Sep 2014 14:27:03 +0100
Subject: Just show 'Call' for call events. Don't just splat out the content of
 the event for other events: it's rarely going to be sesnible.

---
 webclient/recents/recents.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'webclient')

diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html
index 3f025a98d8..56fb38b02a 100644
--- a/webclient/recents/recents.html
+++ b/webclient/recents/recents.html
@@ -51,7 +51,9 @@
                         </div>
 
                         <div ng-switch-default>
-                            {{ room.lastMsg }}
+                            <div ng-if="room.lastMsg.type.indexOf('m.call.') == 0">
+                                Call
+                            </div>
                         </div>
                     </div>
                 </td>
-- 
cgit 1.4.1


From fa6b3490e299ebdb8c24e5858036bbfb67e76c6b Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@matrix.org>
Date: Mon, 1 Sep 2014 15:53:07 +0100
Subject: Handle call events in the recents view as well to get consistency
 with what it displays when refreshed.

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

(limited to 'webclient')

diff --git a/webclient/recents/recents-controller.js b/webclient/recents/recents-controller.js
index d33d41a922..c9fd022d7f 100644
--- a/webclient/recents/recents-controller.js
+++ b/webclient/recents/recents-controller.js
@@ -43,6 +43,11 @@ angular.module('RecentsController', ['matrixService', 'eventHandlerService'])
                 $scope.rooms[event.room_id].lastMsg = event;              
             }
         });
+        $scope.$on(eventHandlerService.CALL_EVENT, function(ngEvent, event, isLive) {
+            if (isLive) {
+                $scope.rooms[event.room_id].lastMsg = event;
+            }
+        });
     };
 
     
-- 
cgit 1.4.1


From b9172b982f6359debd867557028e9df12bf3fe71 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@matrix.org>
Date: Mon, 1 Sep 2014 16:22:57 +0100
Subject: missing semicolon

---
 webclient/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webclient')

diff --git a/webclient/index.html b/webclient/index.html
index 3c31a8a051..bf24e392ac 100644
--- a/webclient/index.html
+++ b/webclient/index.html
@@ -56,7 +56,7 @@
 
     <div id="footer" ng-hide="location.indexOf('/room') == 0">
         <div id="footerContent">
-            &copy 2014 Matrix.org
+            &copy; 2014 Matrix.org
         </div>
     </div>
 </body>
-- 
cgit 1.4.1