From 431bbd762f06345b58af056181196a0032c50485 Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Thu, 12 Nov 2015 12:23:42 -0600
Subject: [PATCH] Move header assignment to app level

---
 website/public/js/app.js                  | 2 ++
 website/public/js/controllers/authCtrl.js | 2 --
 website/public/js/controllers/rootCtrl.js | 2 --
 website/public/js/static.js               | 4 +++-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/public/js/app.js b/website/public/js/app.js
index d0caf41c2b..acda8479f7 100644
--- a/website/public/js/app.js
+++ b/website/public/js/app.js
@@ -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';
   }]);
diff --git a/website/public/js/controllers/authCtrl.js b/website/public/js/controllers/authCtrl.js
index 0a262fc141..7dced7ce00 100644
--- a/website/public/js/controllers/authCtrl.js
+++ b/website/public/js/controllers/authCtrl.js
@@ -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';
diff --git a/website/public/js/controllers/rootCtrl.js b/website/public/js/controllers/rootCtrl.js
index 506a779444..0e6fd743c7 100644
--- a/website/public/js/controllers/rootCtrl.js
+++ b/website/public/js/controllers/rootCtrl.js
@@ -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;
diff --git a/website/public/js/static.js b/website/public/js/static.js
index e87368cdd8..67a07df815 100644
--- a/website/public/js/static.js
+++ b/website/public/js/static.js
@@ -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();
   });
-})  
+})