Created
August 27, 2013 04:19
-
-
Save lefnire/6349586 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/scripts/controllers/RootCtrl.js b/app/scripts/controllers/RootCtrl.js | |
index ec465f5..1e855cd 100644 | |
--- a/app/scripts/controllers/RootCtrl.js | |
+++ b/app/scripts/controllers/RootCtrl.js | |
@@ -11,6 +11,7 @@ habitrpg.controller('RootCtrl', | |
// FIXME this is dangerous, organize helpers.coffee better, so we can group them by which controller needs them, | |
// and then simply _.defaults($scope, Helpers.user) kinda thing | |
+ _.defaults($rootScope, window.habitrpgShared.algos); | |
_.defaults($rootScope, window.habitrpgShared.helpers); | |
$rootScope.authenticated = function() { | |
diff --git a/app/scripts/controllers/characterCtrl.js b/app/scripts/controllers/characterCtrl.js | |
index 52a0f9e..1bc22bd 100644 | |
--- a/app/scripts/controllers/characterCtrl.js | |
+++ b/app/scripts/controllers/characterCtrl.js | |
@@ -11,11 +11,6 @@ habitrpg.controller('CharacterCtrl', | |
$scope.user = User.user; | |
- $scope.equipped = function(user, type) { | |
- var tier = (user.backer && user.backer.tier) | |
- return window.habitrpgShared.helpers.equipped(type, user.items[type], user.preferences, tier); | |
- } | |
- | |
$scope.$watch('user.tasks', function(){ | |
$scope.hpPercent = function(hp) { | |
return (hp / 50) * 100; | |
@@ -30,7 +25,6 @@ habitrpg.controller('CharacterCtrl', | |
$scope.count = function(arr) { | |
return _.size(arr); | |
} | |
- $scope.tnl = window.habitrpgShared.algos.tnl; | |
$scope.showUserAvatar = function() { | |
$('.userAvatar').show() | |
diff --git a/app/views/avatar.html b/app/views/avatar.html | |
index dc173e4..6964b21 100644 | |
--- a/app/views/avatar.html | |
+++ b/app/views/avatar.html | |
@@ -6,13 +6,13 @@ | |
data-checkuser="isUser" | |
> | |
<div class='character-sprites'> | |
- <span class='{{user.preferences.gender}}_skin_{{user.preferences.skin}}'></span> | |
- <span class='{{user.preferences.gender}}_hair_{{user.preferences.hair}}'></span> | |
- <span class="{{equipped(user, 'armor')}}"></span> | |
- <span class="{{equipped(user, 'head')}}"></span> | |
- <span class="{{user.preferences.gender}}_head_0"></span> | |
- <span class='{{user.preferences.gender}}_shield_{{user.items.shield}}'></span> | |
- <span class='{{user.preferences.gender}}_weapon_{{user.items.weapon}}'></span> | |
+ <span ng-class='{{user.preferences.gender}}_skin_{{user.preferences.skin}}'></span> | |
+ <span ng-class='{{user.preferences.gender}}_hair_{{user.preferences.hair}}'></span> | |
+ <span ng-class='{{equipped("armor", user.items.armor, user.preferences, user.backer.tier)}}'></span> | |
+ <span ng-class='{{equipped("head", user.items.head, user.preferences, user.backer.tier)}}' ng-show='user.preferences.showHelm'></span> | |
+ <span ng-class='{{user.preferences.gender}}_head_0' ng-hide='user.preferences.showHelm'></span> | |
+ <span ng-class='{{equipped("shield",user.items.shield,user.preferences,user.backer.tier)}}'></span> | |
+ <span ng-class='{{equipped("weapon",user.items.weapon,user.preferences,user.backer.tier)}}'></span> | |
</div> | |
</figure> | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment