krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into blade-Finish_weeklies_pr

Browse Source
This commit is contained in:
Blade Barringer
2015-06-05 17:35:16 -05:00
parent b132b3c4fa 488919d5ce
commit 164a26616e
71 changed files with 9033 additions and 8423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/public/js/controllers/tasksCtrl.js
View File

@@ -4,6 +4,11 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
function($scope, $rootScope, $location, User, Notification, $http, ApiUrl, $timeout, Shared, Guide) {
$scope.obj = User.user; // used for task-lists
$scope.user = User.user;
$scope.armoireCount = function(gear) {
return Shared.countArmoire(gear);
};
$scope.score = function(task, direction) {
switch (task.type) {
case 'reward':
@@ -213,7 +218,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
------------------------
*/
$scope.$watch('user.items.gear.equipped', function(){
$scope.$watchGroup(['user.items.gear.owned', 'user.flags.armoireEnabled'], function(){
$scope.itemStore = Shared.updateStore(User.user);
},true);