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

Correct seenMessage use in menu

Browse Source 
Closes #5519
This commit is contained in:
Blade Barringer
2015-06-29 08:58:51 -05:00
parent 522181890e
commit 567ed1f28b
3 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,8 +5,8 @@
*/
angular.module('habitrpg')
.controller("AuthCtrl", ['$scope', '$rootScope', 'User', '$http', '$location', '$window','ApiUrl', '$modal', 'Analytics',
function($scope, $rootScope, User, $http, $location, $window, ApiUrl, $modal, Analytics) {
.controller("AuthCtrl", ['$scope', '$rootScope', 'User', '$http', '$location', '$window','ApiUrl', '$modal', 'Analytics', 'Chat',
function($scope, $rootScope, User, $http, $location, $window, ApiUrl, $modal, Analytics, Chat) {
$scope.Analytics = Analytics;
$scope.logout = function() {
@@ -102,6 +102,7 @@ angular.module('habitrpg')
}
};
// @TODO: Pull out menu stuff into separate menu controller
$scope.expandMenu = function(menu) {
$scope._expandedMenu = ($scope._expandedMenu == menu) ? null : menu;
};
@@ -121,6 +122,8 @@ angular.module('habitrpg')
}
};
$scope.clearMessages = Chat.seenMessage;
$scope.iconClasses = function() {
return selectNotificationValue(
"glyphicon-gift",