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 sabrecat/onboarding-tweaks

Browse Source
This commit is contained in:
Sabe Jones
2015-08-25 16:47:46 -04:00
parent 23259cd456 6564cb52dc
commit 0c0525640c
27 changed files with 6521 additions and 6475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,10 @@ habitrpg.controller('NotificationCtrl',
var text, notes, type;
$rootScope.playSound('Item_Drop');
if (after.type !== 'gear' && after.type !== 'Quest' && after.type !== 'Mystery') {
// Note: For Mystery Item gear, after.type will be 'head', 'armor', etc
// so we use after.notificationType below.
if (after.type !== 'gear' && after.type !== 'Quest' && after.notificationType !== 'Mystery') {
if (after.type === 'Food') {
type = 'food';
} else if (after.type === 'HatchingPotion') {
@@ -94,7 +97,7 @@ habitrpg.controller('NotificationCtrl',
} else if (after.type === 'Quest') {
$rootScope.selectedQuest = Content.quests[after.key];
$rootScope.openModal('questDrop', {controller:'PartyCtrl'});
} else if (after.type === 'Mystery') {
} else if (after.notificationType === 'Mystery') {
text = Content.gear.flat[after.key].text();
Notification.drop(env.t('messageDropMysteryItem', {dropText: text}), after);
} else {