krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move header assignment to app level

Browse Source
This commit is contained in:
Blade Barringer
2015-11-12 12:23:42 -06:00
parent 92a8c3d958
commit 431bbd762f
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/public/js/app.js
View File

@@ -255,4 +255,6 @@ window.habitrpg = angular.module('habitrpg',
$httpProvider.defaults.headers.common['x-api-user'] = settings.auth.apiId; $httpProvider.defaults.headers.common['x-api-user'] = settings.auth.apiId;
$httpProvider.defaults.headers.common['x-api-key'] = settings.auth.apiToken; $httpProvider.defaults.headers.common['x-api-key'] = settings.auth.apiToken;
} }
$httpProvider.defaults.headers.common['x-client'] = 'habitica-web';
}]); }]);

2
website/public/js/controllers/authCtrl.js
View File

@@ -9,8 +9,6 @@ angular.module('habitrpg')
function($scope, $rootScope, User, $http, $location, $window, ApiUrl, $modal, Analytics) { function($scope, $rootScope, User, $http, $location, $window, ApiUrl, $modal, Analytics) {
$scope.Analytics = Analytics; $scope.Analytics = Analytics;
$http.defaults.headers.common['x-client'] = 'habitica-web';
$scope.logout = function() { $scope.logout = function() {
localStorage.clear(); localStorage.clear();
window.location.href = '/logout'; window.location.href = '/logout';

2
website/public/js/controllers/rootCtrl.js
View File

@@ -36,8 +36,6 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
$rootScope.toJson = angular.toJson; $rootScope.toJson = angular.toJson;
$rootScope.Payments = Payments; $rootScope.Payments = Payments;
$http.defaults.headers.common['x-client'] = 'habitica-web';
// Angular UI Router // Angular UI Router
$rootScope.$state = $state; $rootScope.$state = $state;
$rootScope.$stateParams = $stateParams; $rootScope.$stateParams = $stateParams;

4
website/public/js/static.js
View File

@@ -19,6 +19,8 @@ window.habitrpg = angular.module('habitrpg', ['chieffancypants.loadingBar', 'ui.
}); });
}) })
} }
$http.defaults.headers.common['x-client'] = 'habitica-web';
}]) }])
.controller("PlansCtrl", ['$rootScope','Analytics', .controller("PlansCtrl", ['$rootScope','Analytics',
@@ -56,4 +58,4 @@ window.habitrpg = angular.module('habitrpg', ['chieffancypants.loadingBar', 'ui.
$(document).ready(function(){ $(document).ready(function(){
openHashAccordion(); openHashAccordion();
}); });
}) })