tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Start the events stream once the app starts (if credentials are in cache) or once the user gets logged in

Browse source
This commit is contained in:
Emmanuel ROHEE 2014-08-28 11:04:01 +02:00
parent 660129deb1
commit 6ac298f2f1
4 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webclient/app-controller.js
View file

@ -33,7 +33,7 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even
}); });
if (matrixService.isUserLoggedIn()) { if (matrixService.isUserLoggedIn()) {
// eventStreamService.resume(); eventStreamService.resume();
mPresence.start(); mPresence.start();
} }

8
webclient/app.js
View file

@ -79,13 +79,11 @@ matrixWebClient.config(['$routeProvider', '$provide', '$httpProvider',
$httpProvider.interceptors.push('AccessTokenInterceptor'); $httpProvider.interceptors.push('AccessTokenInterceptor');
}]); }]);
matrixWebClient.run(['$location', 'matrixService', 'eventStreamService', function($location, matrixService, eventStreamService) { matrixWebClient.run(['$location', 'matrixService', function($location, matrixService) {
// If user auth details are not in cache, go to the login page // If user auth details are not in cache, go to the login page
if (!matrixService.isUserLoggedIn()) { if (!matrixService.isUserLoggedIn()) {
eventStreamService.stop();
$location.path("login"); $location.path("login");
} }
else {
// eventStreamService.resume();
}
}]); }]);

2
webclient/home/home-controller.js
View file

@ -45,8 +45,6 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen
$scope.public_rooms = matrixService.assignRoomAliases(response.data.chunk); $scope.public_rooms = matrixService.assignRoomAliases(response.data.chunk);
} }
); );
eventStreamService.resume();
}; };
$scope.createNewRoom = function(room_id, isPrivate) { $scope.createNewRoom = function(room_id, isPrivate) {

1
webclient/room/room-controller.js
View file

@ -342,7 +342,6 @@ angular.module('RoomController', ['ngSanitize', 'mFileInput', 'mUtilities'])
var chunk = response.data.chunk[i]; var chunk = response.data.chunk[i];
updateMemberList(chunk); updateMemberList(chunk);
} }
eventStreamService.resume();
}, },
function(error) { function(error) {
$scope.feedback = "Failed get member list: " + error.data.error; $scope.feedback = "Failed get member list: " + error.data.error;