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

Reverted changes after refactor

Browse Source
This commit is contained in:
Henry 2015-11-27 13:05:55 -08:00
parent 4b23e3fbcb
commit 6558461fda
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,14 +55,12 @@ 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,7 +80,7 @@ define(
initiatingEvent = this.agentService.isMobile() ?
'touchstart' : 'mousedown',
menu,
popup
popup;
// Remove the context menu
function dismiss() {

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

@ -47,8 +47,6 @@ define(
mockScope,
mockElement,
mockDomainObject,
mockNavigatedObject,
mockNavigationService,
mockEvent,
mockPopup,
mockActionContext,
@ -69,11 +67,9 @@ 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;
@ -83,7 +79,6 @@ define(
mockDocument.find.andReturn(mockBody);
mockRootScope.$new.andReturn(mockScope);
mockPopupService.display.andReturn(mockPopup);
mockNavigationService.getNavigation.andReturn(mockNavigatedObject);
mockActionContext = {key: 'menu', domainObject: mockDomainObject, event: mockEvent};
@ -93,7 +88,6 @@ define(
mockRootScope,
mockPopupService,
mockAgentService,
mockNavigationService,
mockActionContext
);
});
@ -188,15 +182,6 @@ 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(
@ -205,7 +190,6 @@ define(
mockRootScope,
mockPopupService,
mockAgentService,
mockNavigationService,
mockActionContext
);
action.perform();