diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-26 16:03:25 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-26 16:03:25 +0100 |
| commit | b1e98ddc093b04967dffa58a58c2bfee624870b8 (patch) | |
| tree | 1b850cf728afa2f97859429b110a043bc1fdf63e /webclient | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff) | |
| parent | Avoid double call of refresh at app startup (diff) | |
| download | synapse-b1e98ddc093b04967dffa58a58c2bfee624870b8.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'webclient')
| -rw-r--r-- | webclient/home/home-controller.js | 10 | ||||
| -rw-r--r-- | webclient/home/home.html | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/webclient/home/home-controller.js b/webclient/home/home-controller.js index a5576759fa..867ae522a6 100644 --- a/webclient/home/home-controller.js +++ b/webclient/home/home-controller.js @@ -76,9 +76,9 @@ angular.module('HomeController', ['matrixService', 'mFileInput', 'mFileUpload', return data; }; - $scope.refresh = function() { + var refresh = function() { // List all rooms joined or been invited to - matrixService.rooms().then( + matrixService.rooms(1,true).then( function(response) { var data = assignRoomAliases(response.data.rooms); $scope.feedback = "Success"; @@ -118,7 +118,7 @@ angular.module('HomeController', ['matrixService', 'mFileInput', 'mFileUpload', response.data.room_id); matrixService.createRoomIdToAliasMapping( response.data.room_id, response.data.room_alias); - $scope.refresh(); + refresh(); }, function(error) { $scope.feedback = "Failure: " + error.data; @@ -158,5 +158,7 @@ angular.module('HomeController', ['matrixService', 'mFileInput', 'mFileUpload', ); }; - $scope.refresh(); + $scope.onInit = function() { + refresh(); + }; }]); diff --git a/webclient/home/home.html b/webclient/home/home.html index 4818d414b6..4084f4c388 100644 --- a/webclient/home/home.html +++ b/webclient/home/home.html @@ -1,4 +1,4 @@ -<div ng-controller="HomeController"> +<div ng-controller="HomeController" data-ng-init="onInit()"> <div id="page"> <div id="wrapper"> |