safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 13:41:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-1120: Close menu when user clicks outside menu.

Browse Source
This commit is contained in:
Michael Jumper
2015-03-12 00:00:50 -07:00
parent 1c75e9792d
commit 0f4662daff
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
guacamole/src/main/webapp/app/userMenu/directives/guacUserMenu.js
View File

@@ -42,13 +42,14 @@ angular.module('userMenu').directive('guacUserMenu', [function guacUserMenu() {
}, },
templateUrl: 'app/userMenu/templates/guacUserMenu.html', templateUrl: 'app/userMenu/templates/guacUserMenu.html',
controller: ['$scope', '$injector', function guacUserMenuController($scope, $injector) { controller: ['$scope', '$injector', '$element', function guacUserMenuController($scope, $injector, $element) {
// Get required types // Get required types
var ConnectionGroup = $injector.get("ConnectionGroup"); var ConnectionGroup = $injector.get("ConnectionGroup");
var PermissionSet = $injector.get("PermissionSet"); var PermissionSet = $injector.get("PermissionSet");
// Get required services // Get required services
var $document = $injector.get("$document");
var $location = $injector.get("$location"); var $location = $injector.get("$location");
var authenticationService = $injector.get("authenticationService"); var authenticationService = $injector.get("authenticationService");
var userService = $injector.get("userService"); var userService = $injector.get("userService");
@@ -64,7 +65,21 @@ angular.module('userMenu').directive('guacUserMenu', [function guacUserMenu() {
$scope.showStatus(false); $scope.showStatus(false);
} }
}; };
/**
* The outermost element of the user menu directive.
*
* @type Element
*/
var element = $element[0];
/**
* The main document object.
*
* @type Document
*/
var document = $document[0];
/** /**
* Whether the current user has sufficient permissions to use the * Whether the current user has sufficient permissions to use the
* management interface. If permissions have not yet been loaded, * management interface. If permissions have not yet been loaded,
@@ -258,6 +273,18 @@ angular.module('userMenu').directive('guacUserMenu', [function guacUserMenu() {
}); });
}; };
// Close menu when use clicks anywhere else
document.body.addEventListener("click", function clickOutsideMenu() {
$scope.$apply(function closeMenu() {
$scope.menuShown = false;
});
}, false);
// Prevent click within menu from triggering the outside-menu handler
element.addEventListener("click", function clickInsideMenu(e) {
e.stopPropagation();
}, false);
}] // end controller }] // end controller
}; };