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

Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync

Browse Source
This commit is contained in:
Blade Barringer
2015-06-14 16:33:38 -05:00
parent 4ef9762e99 92e2393114
commit 14fe29dd4a
679 changed files with 14883 additions and 11486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
website/public/js/controllers/notificationCtrl.js
View File

@@ -87,6 +87,7 @@ habitrpg.controller('NotificationCtrl',
Notification.drop(User.user._tmp.drop.dialog);
}
$rootScope.playSound('Item_Drop');
mixpanel.track("Acquire Item",{'itemName':after.key,'acquireMethod':'Drop'})
});
$rootScope.$watch('user.achievements.streak', function(after, before){
@@ -100,9 +101,14 @@ habitrpg.controller('NotificationCtrl',
}
});
$rootScope.$watch('user.achievements.ultimateGear', function(after, before){
if (after === before || after !== true) return;
$rootScope.$watch('user.achievements.ultimateGearSets', function(after, before){
if (_.isEqual(after,before) || !_.contains(User.user.achievements.ultimateGearSets, true)) return;
$rootScope.openModal('achievements/ultimateGear');
}, true);
$rootScope.$watch('user.flags.armoireEmpty', function(after,before){
if (before == undefined || after == before || after == false) return;
$rootScope.openModal('armoireEmpty');
});
$rootScope.$watch('user.achievements.rebirths', function(after, before){