krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

authCtrl tests now working, replaced window for $window

Browse Source
This commit is contained in:
Dušan Juretić
2013-10-01 23:20:10 -03:00
parent 43be09a5d5
commit 89b4d2ece0
5 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/js/controllers/authCtrl.js
View File

@@ -4,8 +4,8 @@
The authentication controller (login & facebook)
*/
habitrpg.controller("AuthCtrl", ['$scope', '$rootScope', 'User', '$http', '$location', 'API_URL',
function($scope, $rootScope, User, $http, $location, API_URL) {
habitrpg.controller("AuthCtrl", ['$scope', '$rootScope', 'User', '$http', '$location', '$window','API_URL',
function($scope, $rootScope, User, $http, $location, $window, API_URL) {
var runAuth;
var showedFacebookMessage;
@@ -25,7 +25,7 @@ habitrpg.controller("AuthCtrl", ['$scope', '$rootScope', 'User', '$http', '$loca
runAuth = function(id, token) {
User.authenticate(id, token, function(err) {
window.location.href = '/';
$window.location.href = '/';
//$rootScope.modals.login = false;
});
};
@@ -41,22 +41,22 @@ habitrpg.controller("AuthCtrl", ['$scope', '$rootScope', 'User', '$http', '$loca
runAuth(data.id, data.apiToken);
}).error(function(data, status, headers, config) {
if (status === 0) {
alert("Server not currently reachable, try again later");
$window.alert("Server not currently reachable, try again later");
} else if (!!data && !!data.err) {
alert(data.err);
$window.alert(data.err);
} else {
alert("ERROR: " + status);
$window.alert("ERROR: " + status);
}
});
};
function errorAlert(data, status, headers, config) {
if (status === 0) {
alert("Server not currently reachable, try again later");
$window.alert("Server not currently reachable, try again later");
} else if (!!data && !!data.err) {
alert(data.err);
$window.alert(data.err);
} else {
alert("ERROR: " + status);
$window.alert("ERROR: " + status);
}
}