Merge branch 'develop' into refactor_member_modal_and_stats_page

This commit is contained in:
Blade Barringer
2015-07-22 17:39:39 -05:00
107 changed files with 563 additions and 454 deletions

View File

@@ -9,10 +9,11 @@
'$rootScope',
'Content',
'Groups',
'User'
'User',
'Analytics'
];
function questsFactory($rootScope,Content,Groups,User) {
function questsFactory($rootScope,Content,Groups,User,Analytics) {
var user = User.user;
@@ -83,12 +84,22 @@
$rootScope.selectedQuest = undefined;
}
function questInit(){
Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'quest','owner':true,'response':'accept','questName':$rootScope.selectedQuest.key});
$rootScope.party.$questAccept({key:$rootScope.selectedQuest.key}, function(){
$rootScope.party.$get();
$rootScope.$state.go('options.social.party');
});
closeQuest();
}
return {
lockQuest: lockQuest,
buyQuest: buyQuest,
questPopover: questPopover,
showQuest: showQuest,
closeQuest: closeQuest
closeQuest: closeQuest,
questInit: questInit
}
}
}());