Merge pull request #6226 from HabitRPG/fix_tutorial_flag

Move header assignment to app level
This commit is contained in:
Blade Barringer
2015-11-12 12:37:31 -06:00
4 changed files with 5 additions and 5 deletions
+2
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-key'] = settings.auth.apiToken;
}
$httpProvider.defaults.headers.common['x-client'] = 'habitica-web';
}]);
@@ -9,8 +9,6 @@ angular.module('habitrpg')
function($scope, $rootScope, User, $http, $location, $window, ApiUrl, $modal, Analytics) {
$scope.Analytics = Analytics;
$http.defaults.headers.common['x-client'] = 'habitica-web';
$scope.logout = function() {
localStorage.clear();
window.location.href = '/logout';
@@ -36,8 +36,6 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
$rootScope.toJson = angular.toJson;
$rootScope.Payments = Payments;
$http.defaults.headers.common['x-client'] = 'habitica-web';
// Angular UI Router
$rootScope.$state = $state;
$rootScope.$stateParams = $stateParams;
+3 -1
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',
@@ -56,4 +58,4 @@ window.habitrpg = angular.module('habitrpg', ['chieffancypants.loadingBar', 'ui.
$(document).ready(function(){
openHashAccordion();
});
})
})