From c3999083a8db41a3be5a0898ed4b3a033112c08b Mon Sep 17 00:00:00 2001
From: Bruno Alves de Faria <brunoalvesdefaria@gmail.com>
Date: Thu, 17 Nov 2016 14:57:57 -0200
Subject: [PATCH] LT-354: Repositioning confirmation dialog considering the
 cursor position

---
 .../longitudinalStudyListContextMenu.html         |  2 +-
 .../longitudinalStudyListContextMenu.js           |  8 ++++++--
 .../studyContextMenu/studyContextMenu.js          | 15 +++++++--------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.html b/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.html
index f236e4644..dfc15cc28 100644
--- a/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.html
+++ b/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.html
@@ -12,7 +12,7 @@
 
         {{#let classes=getRemoveAssociationClasses}}
             <li class="{{classes}}">
-                <a  id="removeTimepointAssociations" type="button" class="{{classes}}"
+                <a id="removeTimepointAssociations" type="button" class="{{classes}}"
                     title="Remove Timepoint Association">Remove Association</a>
             </li>
         {{/let}}
diff --git a/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.js b/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.js
index 5376ad687..a8914fe8c 100644
--- a/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.js
+++ b/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.js
@@ -72,11 +72,15 @@ StudyList.functions.viewStudies = viewStudies;
 /**
  * Removes all present study / timepoint associations from the Clinical Trial
  */
-function removeTimepointAssociations() {
+function removeTimepointAssociations($study, event) {
     const dialogSettings = {
         title: 'Remove Association',
         message: 'Measurements related to this Study and Timepoint will be erased. Do you really want to delete this association?',
-        confirmClass: 'btn-danger'
+        confirmClass: 'btn-danger',
+        position: {
+            x: event.clientX,
+            y: event.clientY
+        }
     };
 
     OHIF.ui.showFormDialog('dialogConfirm', dialogSettings).then(() => {
diff --git a/Packages/ohif-study-list/client/components/studyContextMenu/studyContextMenu.js b/Packages/ohif-study-list/client/components/studyContextMenu/studyContextMenu.js
index c1528a108..b7e23be65 100644
--- a/Packages/ohif-study-list/client/components/studyContextMenu/studyContextMenu.js
+++ b/Packages/ohif-study-list/client/components/studyContextMenu/studyContextMenu.js
@@ -1,3 +1,4 @@
+import { Template } from 'meteor/templating';
 import { OHIF } from 'meteor/ohif:core';
 import { $ } from 'meteor/jquery';
 
@@ -55,21 +56,19 @@ function viewSeriesDetails() {
 }
 
 Template.studyContextMenu.events({
-    'click a': function(e) {
-        var id, fn, target = $(e.currentTarget);
+    'click a'(event, instance) {
+        const $target = $(event.currentTarget);
 
-        if (target.hasClass('disabled')) {
+        if ($target.hasClass('disabled')) {
             return;
         }
 
-        id = target.attr('id');
+        const id = $target.attr('id');
         if (id in StudyList.functions) {
-            fn = StudyList.functions[id];
+            const fn = StudyList.functions[id];
             if (typeof fn === 'function') {
-                fn(Template.studyContextMenu.$study);
+                fn(Template.studyContextMenu.$study, event);
             }
         }
-
-        var dialog = $('#studyContextMenu');
     }
 });