hs: Make /login accept full user IDs or just local parts. webclient: Only enable Register button when both password fields match.

This commit is contained in:
Kegan Dougal 2014-08-14 16:29:24 +01:00
parent 53147e5ae4
commit ca3747fb2f
3 changed files with 6 additions and 8 deletions

View file

@ -68,12 +68,6 @@ angular.module('LoginController', ['matrixService'])
};
$scope.login = function() {
if ($scope.account.user_id.indexOf("@") !== 0) {
// technically should be the host of account.homeserver
$scope.account.user_id = "@" + $scope.account.user_id + ":" +
$location.host()
}
matrixService.setConfig({
homeserver: $scope.account.homeserver,
user_id: $scope.account.user_id

View file

@ -15,7 +15,7 @@
<!-- New user registration -->
<div>
<br/>
<button ng-click="register()" ng-disabled="!account.desired_user_name || !account.homeserver || !account.identityServer || !account.pwd1 || !account.pwd2">Register</button>
<button ng-click="register()" ng-disabled="!account.desired_user_name || !account.homeserver || !account.identityServer || !account.pwd1 || !account.pwd2 || account.pwd1 !== account.pwd2">Register</button>
</div>
</form>