diff --git a/platform/commonUI/browse/src/MenuArrowController.js b/platform/commonUI/browse/src/MenuArrowController.js index daa6527b77..e6ab84b5d3 100644 --- a/platform/commonUI/browse/src/MenuArrowController.js +++ b/platform/commonUI/browse/src/MenuArrowController.js @@ -29,9 +29,6 @@ define( function () { "use strict"; - var ROOT_ID = "ROOT", - DEFAULT_PATH = "mine"; - /** * A left-click on the menu arrow should display a * context menu. This controller launches the context @@ -43,14 +40,12 @@ define( context; function showMenu(event) { - /* console.log('showMenu() called'); console.log('$scope ', $scope); console.log('$scope.domainObject ', $scope.domainObject); console.log('domainObject ', domainObject); console.log('event ', event); - */ context = {key: 'menu', event: event, domainObject: domainObject}; domainObject.getCapability('action').perform(context); @@ -59,7 +54,7 @@ define( // attempt to set the domain object $scope.$watch('domainObject', function (c) { domainObject = c; - //console.log('watcher called'); + console.log('watcher called'); }); return { diff --git a/platform/representation/src/actions/ContextMenuAction.js b/platform/representation/src/actions/ContextMenuAction.js index 42764af0d7..432264e852 100644 --- a/platform/representation/src/actions/ContextMenuAction.js +++ b/platform/representation/src/actions/ContextMenuAction.js @@ -50,17 +50,15 @@ define( * @param {DomainObject} domainObject the object on which actions * in the context menu will be performed */ - function ContextMenuAction($compile, $document, $window, $rootScope, element, domainObject, event) { + function ContextMenuAction($compile, $document, $window, $rootScope, actionContext) { //var turnOffMenu; - /* console.log('in ContextMenuAction'); console.log('contextMenuAction event ', event); - */ //function showMenu(event) { var winDim = [$window.innerWidth, $window.innerHeight], - eventCoors = [event.pageX, event.pageY], + eventCoors = [actionContext.event.pageX, actionContext.event.pageY], menuDim = GestureConstants.MCT_MENU_DIMENSIONS, body = $document.find('body'), scope = $rootScope.$new(), @@ -96,12 +94,12 @@ define( "context-menu-holder": true }; - //console.log("ContextMenuAction scope ", scope); + console.log("ContextMenuAction scope ", scope); // Create the context menu menu = $compile(MENU_TEMPLATE)(scope); - //console.log("ContextMenuAction menu ", menu); + console.log("ContextMenuAction menu ", menu); // Add the menu to the body body.append(menu); @@ -110,7 +108,7 @@ define( body.on('click', dismiss); // Don't launch browser's context menu - event.preventDefault(); + actionContext.event.preventDefault(); //} return { diff --git a/platform/representation/src/gestures/ContextMenuGesture.js b/platform/representation/src/gestures/ContextMenuGesture.js index 2cd7ea3afb..592569f49b 100644 --- a/platform/representation/src/gestures/ContextMenuGesture.js +++ b/platform/representation/src/gestures/ContextMenuGesture.js @@ -45,13 +45,11 @@ define( // When context menu event occurs, show object actions instead element.on('contextmenu', function (event) { - /* console.log('in ContextMenuGesture'); console.log('event ', event); console.log('domainObject ', domainObject); console.log('domainObject action', domainObject.getCapability('action')); console.log('domainObject actions', domainObject.getCapability('action').getActions('contextMenu')); - */ actionContext = {key: 'contextMenu', domainObject: domainObject, event: event}; stop = domainObject.getCapability('action').perform(actionContext); @@ -64,7 +62,7 @@ define( * @memberof ContextMenuGesture */ destroy: function () { - //element.off('contextmenu', stop.destroy); + element.off('contextmenu', stop); } }; }