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

fix(menus): keep icon after group ack

Browse Source 
Also corrects a TypeError in the menu closing function.
This commit is contained in:
Sabe Jones
2017-01-04 22:19:57 +00:00
parent 518b874f64
commit 959a3ff85b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/client-old/js/controllers/menuCtrl.js
View File

@@ -108,12 +108,12 @@ angular.module('habitrpg')
'glyphicon-comment', 'glyphicon-comment',
'glyphicon-comment inactive', 'glyphicon-comment inactive',
'glyphicon-question-sign', 'glyphicon-question-sign',
'glyphicon glyphicon-ok-sign' 'glyphicon-ok-sign'
); );
}; };
$scope.hasNoNotifications = function() { $scope.hasNoNotifications = function() {
return selectNotificationValue(false, false, false, false, false, true, false); return selectNotificationValue(false, false, false, false, false, true, false, false);
}; };
$scope.viewGroupApprovalNotification = function (notification, $index) { $scope.viewGroupApprovalNotification = function (notification, $index) {

2
website/client-old/js/directives/close-menu.directive.js
View File

@@ -11,7 +11,7 @@
restrict: 'A', restrict: 'A',
link: function($scope, element, attrs) { link: function($scope, element, attrs) {
element.on('click', function(event) { element.on('click', function(event) {
if ($scope.$parent._expandedMenu) { if ($scope.$parent && $scope.$parent._expandedMenu) {
$scope.$parent._expandedMenu.menu = null; $scope.$parent._expandedMenu.menu = null;
} }
if ($scope._expandedMenu) { if ($scope._expandedMenu) {