diff options
author | Erik Johnston <erik@matrix.org> | 2014-09-03 19:47:32 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-09-03 19:47:32 +0100 |
commit | 0538a4098d797eaa901c168e3a76df2ac94da2ed (patch) | |
tree | bc1ef822fdb3184daf6d39a2ab4da1afb6370dd9 /webclient/home | |
parent | Add database upgrade script (diff) | |
parent | Bump versions. Update change logs. (diff) | |
download | synapse-0538a4098d797eaa901c168e3a76df2ac94da2ed.tar.xz |
Merge branch 'release-v0.2.1' v0.2.1
Diffstat (limited to 'webclient/home')
-rw-r--r-- | webclient/home/home-controller.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webclient/home/home-controller.js b/webclient/home/home-controller.js index f4ce3053ea..85e8990c29 100644 --- a/webclient/home/home-controller.js +++ b/webclient/home/home-controller.js @@ -1,5 +1,5 @@ /* -Copyright 2014 matrix.org +Copyright 2014 OpenMarket Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -74,7 +74,7 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen response.data.room_id, response.data.room_alias); }, function(error) { - $scope.feedback = "Failure: " + error.data; + $scope.feedback = "Failure: " + JSON.stringify(error.data); }); }; @@ -94,7 +94,7 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen $location.url("room/" + room_id); }, function(error) { - $scope.feedback = "Can't join room: " + error.data; + $scope.feedback = "Can't join room: " + JSON.stringify(error.data); } ); }; @@ -106,7 +106,7 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen $location.url("room/" + room_alias); }, function(error) { - $scope.feedback = "Can't join room: " + error.data; + $scope.feedback = "Can't join room: " + JSON.stringify(error.data); } ); }; |