ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-24 15:26:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Edit Mode] Disallow context menu actions on tree items during edit mode. #277

Browse Source
This commit is contained in:
Henry 2015-11-25 14:44:31 -08:00
parent 75d4be290c
commit 9eb8158c4e
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/representation/bundle.json
View File

@ -66,7 +66,8 @@
"$document",
"$rootScope",
"popupService",
"agentService"
"agentService",
"navigationService"
]
}
]

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

@ -55,12 +55,14 @@ define(
$rootScope,
popupService,
agentService,
navigationService,
actionContext
) {
this.$compile = $compile;
this.agentService = agentService;
this.actionContext = actionContext;
this.popupService = popupService;
this.navigationService = navigationService;
this.getDocument = function () { return $document; };
this.getRootScope = function () { return $rootScope; };
}
@ -82,6 +84,10 @@ define(
menu,
popup;
if (this.navigationService.getNavigation() && this.navigationService.getNavigation().hasCapability('editor')){
return;
}
// Remove the context menu
function dismiss() {
if (popup) {

16
platform/representation/test/actions/ContextMenuActionSpec.js
View File

@ -47,6 +47,8 @@ define(
mockScope,
mockElement,
mockDomainObject,
mockNavigatedObject,
mockNavigationService,
mockEvent,
mockPopup,
mockActionContext,
@ -67,9 +69,11 @@ define(
]);
mockRootScope = jasmine.createSpyObj("$rootScope", ["$new"]);
mockAgentService = jasmine.createSpyObj("agentService", ["isMobile"]);
mockNavigationService = jasmine.createSpyObj("navigationService", ["getNavigation"]);
mockScope = jasmine.createSpyObj("scope", ["$destroy"]);
mockElement = jasmine.createSpyObj("element", JQLITE_FUNCTIONS);
mockDomainObject = jasmine.createSpyObj("domainObject", DOMAIN_OBJECT_METHODS);
mockNavigatedObject = jasmine.createSpyObj("domainObject", DOMAIN_OBJECT_METHODS);
mockEvent = jasmine.createSpyObj("event", ["preventDefault", "stopPropagation"]);
mockEvent.pageX = 123;
mockEvent.pageY = 321;
@ -79,6 +83,7 @@ define(
mockDocument.find.andReturn(mockBody);
mockRootScope.$new.andReturn(mockScope);
mockPopupService.display.andReturn(mockPopup);
mockNavigationService.getNavigation.andReturn(mockNavigatedObject);
mockActionContext = {key: 'menu', domainObject: mockDomainObject, event: mockEvent};
@ -88,6 +93,7 @@ define(
mockRootScope,
mockPopupService,
mockAgentService,
mockNavigationService,
mockActionContext
);
});
@ -182,6 +188,15 @@ define(
expect(mockBody.off).not.toHaveBeenCalled();
});
it("is not active when in edit mode", function () {
mockNavigatedObject.hasCapability.andReturn(true);
// Show the menu
action.perform();
expect(mockPopupService.display).not.toHaveBeenCalled();
});
it("keeps a menu when menu is clicked on mobile", function () {
mockAgentService.isMobile.andReturn(true);
action = new ContextMenuAction(
@ -190,6 +205,7 @@ define(
mockRootScope,
mockPopupService,
mockAgentService,
mockNavigationService,
mockActionContext
);
action.perform();