summary refs log tree commit diff
path: root/webclient/components
diff options
context:
space:
mode:
authorEmmanuel ROHEE <manu@Emmanuels-MacBook-Pro.local>2014-09-08 18:21:41 +0200
committerEmmanuel ROHEE <manu@Emmanuels-MacBook-Pro.local>2014-09-08 18:21:41 +0200
commit9a5f224931bee9366d41715d13cbbdcfecde5537 (patch)
tree04628706cb1bc5dcb1370689635dcd13815c9780 /webclient/components
parentApp startup improvements: (diff)
downloadsynapse-9a5f224931bee9366d41715d13cbbdcfecde5537.tar.xz
matrixService.rooms must be renamed matrixService.initialSync now
Diffstat (limited to 'webclient/components')
-rw-r--r--webclient/components/matrix/event-stream-service.js2
-rw-r--r--webclient/components/matrix/matrix-service.js5
2 files changed, 4 insertions, 3 deletions
diff --git a/webclient/components/matrix/event-stream-service.js b/webclient/components/matrix/event-stream-service.js
index 28422c4cb9..4c0091dedb 100644
--- a/webclient/components/matrix/event-stream-service.js
+++ b/webclient/components/matrix/event-stream-service.js
@@ -105,7 +105,7 @@ angular.module('eventStreamService', [])
         var deferred = $q.defer();
 
         // FIXME: We are discarding all the messages.
-        matrixService.rooms(1, false).then(
+        matrixService.initialSync(1, false).then(
             function(response) {
                 var rooms = response.data.rooms;
                 for (var i = 0; i < rooms.length; ++i) {
diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js
index 3c28c52fbe..6864726ba4 100644
--- a/webclient/components/matrix/matrix-service.js
+++ b/webclient/components/matrix/matrix-service.js
@@ -130,8 +130,9 @@ angular.module('matrixService', [])
             return doRequest("POST", path, undefined, req);
         },
 
-        // List all rooms joined or been invited to
-        rooms: function(limit, feedback) {
+        // Get the user's current state: his presence, the list of his rooms with
+        // the last {limit} events
+        initialSync: function(limit, feedback) {
             // The REST path spec
 
             var path = "/initialSync";