sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 01:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge @speg pr

Browse source
This commit is contained in:
Matteo Pagliazzi 2014-01-28 19:08:35 +01:00
commit 6ac7f9e5c7
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,6 +61,7 @@ angular.module('authCtrl', [])
}
}
<<<<<<< HEAD
$scope.auth = function() {
var data = {
username: $scope.loginUsername,
@ -74,6 +75,12 @@ 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(){