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' of github.com:HabitRPG/habitrpg into common-convert

Browse Source
This commit is contained in:
Blade Barringer
2015-02-12 13:32:23 -06:00
parent df5ff3d5a1 89e73954ae
commit 477d3d6085
7 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,12 +84,14 @@ angular.module('habitrpg')
$scope._expandedMenu = ($scope._expandedMenu == menu) ? null : menu;
};
function selectNotificationValue(mysteryValue, invitationValue, unallocatedValue, messageValue, noneValue) {
function selectNotificationValue(mysteryValue, invitationValue, holidayCardValue, unallocatedValue, messageValue, noneValue) {
var user = $scope.user;
if (user.purchased && user.purchased.plan && user.purchased.plan.mysteryItems && user.purchased.plan.mysteryItems.length) {
return mysteryValue;
} else if ((user.invitations.party && user.invitations.party.id) || (user.invitations.guilds && user.invitations.guilds.length > 0)) {
return invitationValue;
} else if ((user.items.special.valentineReceived[0] || user.items.special.nyeReceived[0])) {
return holidayCardValue;
} else if (user.flags.classSelected && !(user.preferences && user.preferences.disableClasses) && user.stats.points) {
return unallocatedValue;
} else if (!(_.isEmpty(user.newMessages))) {
@@ -103,13 +105,14 @@ angular.module('habitrpg')
return selectNotificationValue(
"glyphicon-gift",
"glyphicon-user",
"glyphicon-envelope",
"glyphicon-plus-sign",
"glyphicon-comment",
"glyphicon-comment inactive");
};
$scope.hasNoNotifications = function() {
return selectNotificationValue(false, false, false, false, true);
return selectNotificationValue(false, false, false, false, false, true);
}
// ------ Social ----------