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

fix: Prevent message from displaying if no new messages exist

Browse Source
This commit is contained in:
Blade Barringer
2016-06-19 08:38:07 -05:00
parent b62fbab6f8
commit 941ff10cdc
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/client/js/controllers/rootCtrl.js
View File

@@ -22,8 +22,7 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
$rootScope.pageTitle = $state.current.title;
if (!!fromState.name) Analytics.track({'hitType':'pageview','eventCategory':'navigation','eventAction':'navigate','page':'/#/'+toState.name});
// clear inbox when entering inbox tab
if (toState.name=='options.social.inbox') {
if (toState.name=='options.social.inbox' && User.user.inbox && User.user.inbox.newMessages > 0) {
User.clearNewMessages();
}
});

6
website/client/js/services/userServices.js
View File

@@ -14,8 +14,8 @@ angular.module('habitrpg')
/**
* Services that persists and retrieves user from localStorage.
*/
.factory('User', ['$rootScope', '$http', '$location', '$window', 'STORAGE_USER_ID', 'STORAGE_SETTINGS_ID', 'Notification', 'ApiUrl', 'Tasks', 'Tags', 'Content', 'UserNotifications',
function($rootScope, $http, $location, $window, STORAGE_USER_ID, STORAGE_SETTINGS_ID, Notification, ApiUrl, Tasks, Tags, Content, UserNotifications) {
.factory('User', ['$rootScope', '$http', '$location', '$window', '$state', 'STORAGE_USER_ID', 'STORAGE_SETTINGS_ID', 'Notification', 'ApiUrl', 'Tasks', 'Tags', 'Content', 'UserNotifications',
function($rootScope, $http, $location, $window, $state, STORAGE_USER_ID, STORAGE_SETTINGS_ID, Notification, ApiUrl, Tasks, Tags, Content, UserNotifications) {
var authenticated = false;
var defaultSettings = {
auth: { apiId: '', apiToken: ''},
@@ -106,7 +106,7 @@ angular.module('habitrpg')
.then(function (response) {
var tasks = response.data.data;
syncUserTasks(tasks);
if ($rootScope.$state && $rootScope.$state.current.name=='options.social.inbox') {
if ($state.current.name=='options.social.inbox' && user.inbox.newMessages > 0) {
userServices.clearNewMessages();
}
$rootScope.$emit('userSynced');