diff --git a/.gitignore b/.gitignore index a02e1983f7..5c580df579 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ config.json npm-debug.log lib public/bower_components +builtAssets/ src/*/*.js src/*/*.map diff --git a/assets/js/controllers/authCtrl.js b/assets/js/controllers/authCtrl.js index 8e9fa639e0..1d4fa15f65 100644 --- a/assets/js/controllers/authCtrl.js +++ b/assets/js/controllers/authCtrl.js @@ -4,7 +4,8 @@ The authentication controller (login & facebook) */ -habitrpg.controller("AuthCtrl", function($scope, $rootScope, Facebook, LocalAuth, User, $http, $location, API_URL) { +habitrpg.controller("AuthCtrl", ['$scope', '$rootScope', 'Facebook', 'LocalAuth', 'User', '$http', '$location', 'API_URL', + function($scope, $rootScope, Facebook, LocalAuth, User, $http, $location, API_URL) { var runAuth; var showedFacebookMessage; $scope.useUUID = false; @@ -65,4 +66,4 @@ habitrpg.controller("AuthCtrl", function($scope, $rootScope, Facebook, LocalAuth }); } }; -}); +}]); diff --git a/assets/js/controllers/rootCtrl.js b/assets/js/controllers/rootCtrl.js index 2e804fd531..1bc77068b5 100644 --- a/assets/js/controllers/rootCtrl.js +++ b/assets/js/controllers/rootCtrl.js @@ -3,7 +3,8 @@ /* Make user and settings available for everyone through root scope. */ -habitrpg.controller("RootCtrl", function($scope, $rootScope, $location, User) { +habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', + function($scope, $rootScope, $location, User) { $rootScope.modals = {}; $rootScope.User = User; $rootScope.user = User.user; @@ -35,4 +36,4 @@ habitrpg.controller("RootCtrl", function($scope, $rootScope, $location, User) { $rootScope.set('flags.newStuff',false); } -}); +}]); diff --git a/assets/js/controllers/taskDetailsCtrl.js b/assets/js/controllers/taskDetailsCtrl.js index abfc44eaf3..8352570a65 100644 --- a/assets/js/controllers/taskDetailsCtrl.js +++ b/assets/js/controllers/taskDetailsCtrl.js @@ -1,6 +1,7 @@ "use strict"; -habitrpg.controller("TaskDetailsCtrl", function($scope, $rootScope, $location, User) { +habitrpg.controller("TaskDetailsCtrl", ['$scope', '$rootScope', '$location', 'User', + function($scope, $rootScope, $location, User) { $scope.save = function(task) { var log, setVal; setVal = function(k, v) { @@ -54,4 +55,4 @@ habitrpg.controller("TaskDetailsCtrl", function($scope, $rootScope, $location, U $scope.editedTask = null; $scope.editing = false; }; -}); +}]); diff --git a/assets/js/controllers/tasksCtrl.js b/assets/js/controllers/tasksCtrl.js index 995aaad441..531c13e601 100644 --- a/assets/js/controllers/tasksCtrl.js +++ b/assets/js/controllers/tasksCtrl.js @@ -1,6 +1,7 @@ "use strict"; -habitrpg.controller("TasksCtrl", function($scope, $rootScope, $location, User, Algos, Helpers, Notification) { +habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User', 'Algos', 'Helpers', 'Notification', + function($scope, $rootScope, $location, User, Algos, Helpers, Notification) { /*FIXME */ $scope.taskLists = [ @@ -152,4 +153,4 @@ habitrpg.controller("TasksCtrl", function($scope, $rootScope, $location, User, A }); } }; -}); +}]); diff --git a/assets/js/controllers/userAvatarCtrl.js b/assets/js/controllers/userAvatarCtrl.js index dd888fe153..2e6cd4ef17 100644 --- a/assets/js/controllers/userAvatarCtrl.js +++ b/assets/js/controllers/userAvatarCtrl.js @@ -1,17 +1,16 @@ "use strict"; -habitrpg.controller("UserAvatarCtrl", function($scope, $location, filterFilter, User) { - debugger +habitrpg.controller("UserAvatarCtrl", ['$scope', '$location', 'User', + function($scope, $location, User) { $scope.profile = User.user; $scope.hideUserAvatar = function() { $(".userAvatar").hide(); }; $scope.clickAvatar = function(profile) { - debugger if (User.user.id == profile.id) { if ($location.path() == '/tasks') { - $location.path('/options') + $location.path('/options'); } else { $location.path('/tasks'); } @@ -20,4 +19,4 @@ habitrpg.controller("UserAvatarCtrl", function($scope, $location, filterFilter, //$("#avatar-modal-#{uid}").modal('show') } } -}); +}]);