1 files changed, 6 insertions, 22 deletions
diff --git a/webclient/app-controller.js b/webclient/app-controller.js
index 96656e12c3..84cb94dc74 100644
--- a/webclient/app-controller.js
+++ b/webclient/app-controller.js
@@ -31,31 +31,15 @@ angular.module('MatrixWebClientController', ['matrixService'])
$rootScope.$on('$routeChangeSuccess', function (event, current, previous) {
$scope.location = $location.path();
});
-
-
- // Manage the display of the current config
- $scope.config;
-
- // Toggles the config display
- $scope.showConfig = function() {
- if ($scope.config) {
- $scope.config = undefined;
- }
- else {
- $scope.config = matrixService.config();
- }
- };
-
- $scope.closeConfig = function() {
- if ($scope.config) {
- $scope.config = undefined;
- }
- };
if (matrixService.isUserLoggedIn()) {
- eventStreamService.resume();
+ // eventStreamService.resume();
}
+ $scope.go = function(url) {
+ $location.url(url);
+ };
+
// Logs the user out
$scope.logout = function() {
// kill the event stream
@@ -66,7 +50,7 @@ angular.module('MatrixWebClientController', ['matrixService'])
matrixService.saveConfig();
// And go to the login page
- $location.path("login");
+ $location.url("login");
};
// Listen to the event indicating that the access token is no longer valid.
|