summary refs log tree commit diff
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-09-01 16:27:11 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-09-01 16:27:11 +0200
commit26a95988da7974c18cf9528a035407d61cc6057c (patch)
tree01dcb81f7b0c1ef0a93fd5487755aa434f35910f
parentFixed presence state update. Specifically, the current user was sometimes ind... (diff)
downloadsynapse-26a95988da7974c18cf9528a035407d61cc6057c.tar.xz
Fixed presence change that occurs -Xs ago
-rw-r--r--webclient/room/room-controller.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index 048350110b..046d1ca204 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -337,6 +337,11 @@ angular.module('RoomController', ['ngSanitize', 'mFileInput'])
         // Make sure the initialSync has been before going further
         eventHandlerService.waitForInitialSyncCompletion().then(
             function() {
+                
+                // Some data has been retrieved from the iniialSync request
+                // So, the relative time starts here
+                $scope.now = new Date().getTime();
+                
                 var needsToJoin = true;
                 
                 // The room members is available in the data fetched by initialSync