From bf8ec2596fb1f28b2bf99f76f2300c167fb751e2 Mon Sep 17 00:00:00 2001 From: MathWhiz Date: Fri, 22 Jul 2016 15:57:21 -0400 Subject: [PATCH] Add semicolons --- website/client/js/controllers/userCtrl.js | 2 +- website/client/js/services/costumeServices.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/website/client/js/controllers/userCtrl.js b/website/client/js/controllers/userCtrl.js index 77c493c572..4f731f459b 100644 --- a/website/client/js/controllers/userCtrl.js +++ b/website/client/js/controllers/userCtrl.js @@ -16,7 +16,7 @@ habitrpg.controller("UserCtrl", ['$rootScope', '$scope', '$location', 'User', '$ if(value === true) $scope.editingProfile = angular.copy(User.user.profile); }); - $scope.formatAnimal = Pets.formatAnimal; + $scope.formatAnimal = Costume.formatAnimal; $scope.allocate = function(stat){ User.allocate({query:{stat:stat}}); diff --git a/website/client/js/services/costumeServices.js b/website/client/js/services/costumeServices.js index 24820dba6a..a6897ba0d2 100644 --- a/website/client/js/services/costumeServices.js +++ b/website/client/js/services/costumeServices.js @@ -26,14 +26,14 @@ potion: Content.hatchingPotions[info.potion].text() }; animal[type == 'pet' ? 'egg' : 'mount'] = Content.eggs[info.egg].text() - return window.env.t(type+'Name', animal) + return window.env.t(type+'Name', animal); } else { - return type == 'pet' ? window.env.t(Content.specialPets[name]) : window.env.t(Content.specialMounts[name]) + return type == 'pet' ? window.env.t(Content.specialPets[name]) : window.env.t(Content.specialMounts[name]); } } return { formatAnimal: formatAnimal - } + }; } }()); \ No newline at end of file