ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-01 19:06:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Menus] Dismiss menu when clicked

Browse Source 
Addresses WTD-1506 (context menu does not disappear after
action is chosen); listen for click events on the menu
itself and dismiss the menu when these occur.
This commit is contained in:
Victor Woeltjen 2015-08-07 14:34:27 -07:00
parent 7ded288154
commit 87aa0cfce2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
platform/representation/src/actions/ContextMenuAction.js
View File

@ -31,7 +31,8 @@ define(
var MENU_TEMPLATE = "<mct-representation key=\"'context-menu'\" " +
"mct-object=\"domainObject\" " +
"ng-class=\"menuClass\"" +
"ng-click=\"dismiss()\" " +
"ng-class=\"menuClass\" " +
"ng-style=\"menuStyle\">" +
"</mct-representation>",
dismissExistingMenu;
@ -48,7 +49,7 @@ define(
* should be performed
*/
function ContextMenuAction($compile, $document, $window, $rootScope, actionContext) {
function perform() {
var winDim = [$window.innerWidth, $window.innerHeight],
eventCoors = [actionContext.event.pageX, actionContext.event.pageY],
@ -62,7 +63,7 @@ define(
// Remove the context menu
function dismiss() {
menu.remove();
body.off("click", dismiss);
body.off("mousedown", dismiss);
dismissExistingMenu = undefined;
}
@ -86,18 +87,19 @@ define(
"go-up": goUp,
"context-menu-holder": true
};
scope.dismiss = dismiss;
// Create the context menu
menu = $compile(MENU_TEMPLATE)(scope);
// Add the menu to the body
body.append(menu);
// Stop propagation so that clicks on the menu do not close the menu
menu.on('mousedown', function (event) {
event.stopPropagation();
});
// Dismiss the menu when body is clicked elsewhere
// ('mousedown' because 'click' breaks left-click context menus)
body.on('mousedown', dismiss);
@ -105,7 +107,7 @@ define(
// Don't launch browser's context menu
actionContext.event.preventDefault();
}
return {
perform: perform
};
@ -113,4 +115,4 @@ define(
return ContextMenuAction;
}
);
);