From 68bdf223ab7adf487b07a29c657c27474cdae63d Mon Sep 17 00:00:00 2001
From: Evren Ozkan <evren217@gmail.com>
Date: Fri, 2 Mar 2018 10:09:15 -0500
Subject: [PATCH] Fix the issue with the tool context menu

---
 .../viewer/toolContextMenu/toolContextMenu.js   | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Packages/ohif-viewerbase/client/components/viewer/toolContextMenu/toolContextMenu.js b/Packages/ohif-viewerbase/client/components/viewer/toolContextMenu/toolContextMenu.js
index 45797b81c..069629a7e 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/toolContextMenu/toolContextMenu.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/toolContextMenu/toolContextMenu.js
@@ -33,8 +33,7 @@ const getTypeText = function(toolData, actionType) {
     return `${actionType} ${message}`;
 };
 
-const createDropdown = function(event, isTouchEvent = false) {
-    const eventData = event.detail;
+const createDropdown = function(eventData, isTouchEvent = false) {
     const nearbyToolData = toolManager.getNearbyToolData(eventData.element, eventData.currentPoints.canvas, toolTypes);
 
     // Annotate tools for touch events already have a press handle to edit it, has a better UX for deleting it
@@ -57,13 +56,17 @@ const createDropdown = function(event, isTouchEvent = false) {
 };
 
 Template.viewerMain.events({
-    'cornerstonetoolsmouseclick .imageViewerViewport'(event, instance) {
-        if (event.which === 3) {
-            createDropdown(event);
+    'cornerstonetoolsmouseclick .imageViewerViewport'(event) {
+        const { originalEvent } = event;
+        const eventData = originalEvent.detail;
+        if (eventData.which === 3) {
+            createDropdown(eventData);
         }
     },
 
-    'cornerstonetoolstouchpress .imageViewerViewport'(event, instance) {
-        createDropdown(event, true);
+    'cornerstonetoolstouchpress .imageViewerViewport'(event) {
+        const { originalEvent } = event;
+        const eventData = originalEvent.detail;
+        createDropdown(eventData, true);
     }
 });