sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-03 12:40:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(merge)

Browse source
This commit is contained in:
Matteo Pagliazzi 2014-01-28 19:10:07 +01:00
parent 6ac7f9e5c7
commit 14b01836c5
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
public/js/controllers/authCtrl.js
View file

@ -61,11 +61,10 @@ angular.module('authCtrl', [])
}
}
<<<<<<< HEAD
$scope.auth = function() {
var data = {
username: $scope.loginUsername,
password: $scope.loginPassword
username: $scope.loginUsername || $('#login-tab input[name="username"]').val(),
password: $scope.loginPassword || $('#login-tab input[name="password"]').val()
};
if ($scope.useUUID) {
runAuth($scope.loginUsername, $scope.loginPassword);
@ -75,12 +74,6 @@ angular.module('authCtrl', [])
runAuth(data.id, data.token);
}).error(errorAlert);
}
=======
$scope.auth = function() {
var data = {
username: $scope.loginUsername || $('#login-tab input[name="username"]').val(),
password: $scope.loginPassword || $('#login-tab input[name="password"]').val()
>>>>>>> 99dccc288e4ab6c61a317437616b79d157e8b68b
};
$scope.playButtonClick = function(){