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

Mark private messages as read when entering the inbox and syncing while in the inbox. closes #7689

Browse Source
This commit is contained in:
Husman
2016-06-18 19:42:11 -07:00
parent 813aa2cf38
commit b62fbab6f8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -106,6 +106,9 @@ angular.module('habitrpg')
.then(function (response) { .then(function (response) {
var tasks = response.data.data; var tasks = response.data.data;
syncUserTasks(tasks); syncUserTasks(tasks);
if ($rootScope.$state && $rootScope.$state.current.name=='options.social.inbox') {
userServices.clearNewMessages();
}
$rootScope.$emit('userSynced'); $rootScope.$emit('userSynced');
$rootScope.appLoaded = true; $rootScope.appLoaded = true;
$rootScope.$emit('userUpdated', user); $rootScope.$emit('userUpdated', user);