alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master' into open1482c

Browse Source 
Conflicts:
	platform/representation/src/actions/ContextMenuAction.js
This commit is contained in:
Victor Woeltjen
2015-08-17 15:05:34 -07:00
parent 4481c44c4b 9ab06cfdd2
commit f4ae86eb53
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ define(
var MENU_TEMPLATE = "<mct-representation key=\"'context-menu'\" " +
"mct-object=\"domainObject\" " +
"ng-class=\"menuClass\"" +
"ng-class=\"menuClass\" " +
"ng-style=\"menuStyle\">" +
"</mct-representation>",
dismissExistingMenu;
@@ -75,7 +75,7 @@ define(
// Remove the context menu
function dismiss() {
menu.remove();
body.off("click", dismiss);
body.off("mousedown", dismiss);
dismissExistingMenu = undefined;
}