summary refs log tree commit diff
path: root/webclient/login
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-08-22 11:43:54 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-08-22 11:44:09 +0200
commitdde50d4245136cdbd11ac3b4af42102945cd14f9 (patch)
treebdf0f420429116b2ca23aa2072e012ea51270bad /webclient/login
parentMake the content repo work with in daemon mode. Return the full url on upload... (diff)
downloadsynapse-dde50d4245136cdbd11ac3b4af42102945cd14f9.tar.xz
Use $location.url instead of $location.path to get clean page URL without hash arguments of the previous page.
This happpens with room URL like http://127.0.0.1:8080/matrix/client/#/room/#public:localhost. The second hash part is transferred to the next page when using $location.path.
Diffstat (limited to 'webclient/login')
-rw-r--r--webclient/login/login-controller.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/webclient/login/login-controller.js b/webclient/login/login-controller.js
index 67d0b7b90c..2f1f224a94 100644
--- a/webclient/login/login-controller.js
+++ b/webclient/login/login-controller.js
@@ -53,7 +53,7 @@ angular.module('LoginController', ['matrixService'])
                 matrixService.saveConfig();
                 eventStreamService.resume();
                  // Go to the user's rooms list page
-                $location.path("rooms");
+                $location.url("rooms");
             },
             function(error) {
                 if (error.data) {
@@ -84,7 +84,7 @@ angular.module('LoginController', ['matrixService'])
                     });
                     matrixService.saveConfig();
                     eventStreamService.resume();
-                    $location.path("rooms");
+                    $location.url("rooms");
                 }
                 else {
                     $scope.feedback = "Failed to login: " + JSON.stringify(response.data);