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

Merge branch 'develop' into refactor_member_modal_and_stats_page

Browse Source
This commit is contained in:
Blade Barringer
2015-07-22 17:39:39 -05:00
parent 7b9102c88c 0f1c92184c
commit c41271e558
107 changed files with 563 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
website/public/js/controllers/inventoryCtrl.js
View File

@@ -17,6 +17,7 @@ habitrpg.controller("InventoryCtrl",
$scope.questPopover = Quests.questPopover;
$scope.showQuest = Quests.showQuest;
$scope.closeQuest = Quests.closeQuest;
$scope.questInit = Quests.questInit;
// count egg, food, hatchingPotion stack totals
var countStacks = function(items) { return _.reduce(items,function(m,v){return m+v;},0);}
@@ -147,14 +148,6 @@ habitrpg.controller("InventoryCtrl",
User.user.ops.equip({params:{type: 'mount', key: egg + '-' + potion}});
}
$scope.questInit = function(){
Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'quest','owner':true,'response':'accept','questName':$scope.selectedQuest.key});
$rootScope.party.$questAccept({key:$scope.selectedQuest.key}, function(){
$rootScope.party.$get();
});
$scope.closeQuest();
}
$scope.getSeasonalShopArray = function(set){
var flatGearArray = _.toArray(Content.gear.flat);