[Browse] Right click works

Right clicking for a context menu now
works again. #33.
This commit is contained in:
Sarah Hale
2015-07-02 11:30:45 -07:00
parent 861b4781fe
commit 30d8c1647c
2 changed files with 55 additions and 64 deletions

View File

@@ -37,26 +37,20 @@ define(
dismissExistingMenu; dismissExistingMenu;
/** /**
* Add listeners to a representation such that it launches a * Launches a custom context menu for the domain object it contains.
* custom context menu for the domain object it contains.
* *
* @constructor * @constructor
* @param $compile Angular's $compile service * @param $compile Angular's $compile service
* @param $document the current document * @param $document the current document
* @param $window the active window * @param $window the active window
* @param $rootScope Angular's root scope * @param $rootScope Angular's root scope
* @param element the jqLite-wrapped element which should exhibit * @param actionContexr the context in which the action
* the context mennu * should be performed
* @param {DomainObject} domainObject the object on which actions
* in the context menu will be performed
*/ */
function ContextMenuAction($compile, $document, $window, $rootScope, actionContext) { function ContextMenuAction($compile, $document, $window, $rootScope, actionContext) {
//var turnOffMenu;
console.log('in ContextMenuAction'); function perform() {
console.log('contextMenuAction event ', event); //console.log('in perform()');
//function showMenu(event) {
var winDim = [$window.innerWidth, $window.innerHeight], var winDim = [$window.innerWidth, $window.innerHeight],
eventCoors = [actionContext.event.pageX, actionContext.event.pageY], eventCoors = [actionContext.event.pageX, actionContext.event.pageY],
menuDim = GestureConstants.MCT_MENU_DIMENSIONS, menuDim = GestureConstants.MCT_MENU_DIMENSIONS,
@@ -82,7 +76,7 @@ define(
dismissExistingMenu = dismiss; dismissExistingMenu = dismiss;
// Set up the scope, including menu positioning // Set up the scope, including menu positioning
scope.domainObject = domainObject; scope.domainObject = actionContext.domainObject;
scope.menuStyle = {}; scope.menuStyle = {};
scope.menuStyle[goLeft ? "right" : "left"] = scope.menuStyle[goLeft ? "right" : "left"] =
(goLeft ? (winDim[0] - eventCoors[0]) : eventCoors[0]) + 'px'; (goLeft ? (winDim[0] - eventCoors[0]) : eventCoors[0]) + 'px';
@@ -94,13 +88,9 @@ define(
"context-menu-holder": true "context-menu-holder": true
}; };
console.log("ContextMenuAction scope ", scope);
// Create the context menu // Create the context menu
menu = $compile(MENU_TEMPLATE)(scope); menu = $compile(MENU_TEMPLATE)(scope);
console.log("ContextMenuAction menu ", menu);
// Add the menu to the body // Add the menu to the body
body.append(menu); body.append(menu);
@@ -109,7 +99,7 @@ define(
// Don't launch browser's context menu // Don't launch browser's context menu
actionContext.event.preventDefault(); actionContext.event.preventDefault();
//} }
return { return {
/** /**
@@ -122,7 +112,8 @@ define(
if (dismissExistingMenu) { if (dismissExistingMenu) {
dismissExistingMenu(); dismissExistingMenu();
} }
} },
perform: perform
}; };
} }

View File

@@ -49,7 +49,7 @@ define(
console.log('event ', event); console.log('event ', event);
console.log('domainObject ', domainObject); console.log('domainObject ', domainObject);
console.log('domainObject action', domainObject.getCapability('action')); console.log('domainObject action', domainObject.getCapability('action'));
console.log('domainObject actions', domainObject.getCapability('action').getActions('contextMenu')); console.log('domainObject actions', domainObject.getCapability('action').getActions('menu'));
actionContext = {key: 'menu', domainObject: domainObject, event: event}; actionContext = {key: 'menu', domainObject: domainObject, event: event};
stop = domainObject.getCapability('action').perform(actionContext); stop = domainObject.getCapability('action').perform(actionContext);