From e2d855c3335a1d611c8ecaf5f52cc9cd724c3012 Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.ziegler@ulg.ac.be>
Date: Mon, 7 Mar 2016 14:34:29 +0100
Subject: [PATCH] Fix worklist context menu position (LT-193)

---
 .../studyContextMenu/studyContextMenu.js      | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/Packages/worklist/client/components/studyContextMenu/studyContextMenu.js b/Packages/worklist/client/components/studyContextMenu/studyContextMenu.js
index 0c1091b79..048c2f2c0 100644
--- a/Packages/worklist/client/components/studyContextMenu/studyContextMenu.js
+++ b/Packages/worklist/client/components/studyContextMenu/studyContextMenu.js
@@ -23,8 +23,16 @@ openStudyContextMenu = function(e) {
         display: 'block'
     };
 
+    var pageHeight = $(document).height();
+    dialogProperty.top = Math.max(e.pageY, 0);
+    dialogProperty.top = Math.min(dialogProperty.top, pageHeight - dialog.outerHeight());
+
+    var pageWidth = $(document).width();
+    dialogProperty.left = Math.max(e.pageX, 0);
+    dialogProperty.left = Math.min(dialogProperty.left, pageWidth - dialog.outerWidth());
+
     // Device is touch device or not
-    // If device is touch device, set position center of screen vertically and horizontally// jscs:ignore
+    // If device is touch device, set position center of screen vertically and horizontally
     if (isTouchDevice()) {
         // add dialogMobile class to provide a black, transparent background
         dialog.addClass('dialogMobile');
@@ -32,17 +40,7 @@ openStudyContextMenu = function(e) {
         dialogProperty.left = 0;
         dialogProperty.right = 0;
         dialogProperty.bottom = 0;
-    } else {
-        dialogProperty.top = e.pageY;
-        dialogProperty.left = e.pageX;
-
-        var pageHeight = $(document.body).height();
-        dialogProperty.top = Math.max(dialogProperty.top, 0);
-        dialogProperty.top = Math.min(dialogProperty.top, pageHeight - dialog.outerHeight());
-
-        var pageWidth = $(document.body).width();
-        dialogProperty.left = Math.max(dialogProperty.left, 0);
-        dialogProperty.left = Math.min(dialogProperty.left, pageWidth - dialog.outerWidth());
+        dialogProperty.margin = 'auto';
     }
 
     dialog.css(dialogProperty);