From 3246bdae7a2b2b31e288da3f9d465c31929e3702 Mon Sep 17 00:00:00 2001 From: Bruno Alves de Faria Date: Wed, 13 Dec 2017 14:25:26 -0200 Subject: [PATCH] Allowing event positioning on simple dialogs --- .../client/components/bootstrap/dialog/simple.js | 11 ++++++++++- .../client/components/caseProgress/caseProgress.js | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Packages/ohif-core/client/components/bootstrap/dialog/simple.js b/Packages/ohif-core/client/components/bootstrap/dialog/simple.js index 91f998759..b4ca7ba60 100644 --- a/Packages/ohif-core/client/components/bootstrap/dialog/simple.js +++ b/Packages/ohif-core/client/components/bootstrap/dialog/simple.js @@ -31,7 +31,16 @@ Template.dialogSimple.onRendered(() => { // Create the bootstrap modal $modal.modal(modalOptions); - const position = instance.data.position; + let position = instance.data.position; + + const { event } = instance.data; + if (!position && event && !_.isUndefined(event.clientX)) { + position = { + x: event.clientX, + y: event.clientY + }; + } + if (position) { OHIF.ui.repositionDialog($modal, position.x, position.y); } diff --git a/Packages/ohif-measurements/client/components/caseProgress/caseProgress.js b/Packages/ohif-measurements/client/components/caseProgress/caseProgress.js index 28b47fd41..f421da1c3 100644 --- a/Packages/ohif-measurements/client/components/caseProgress/caseProgress.js +++ b/Packages/ohif-measurements/client/components/caseProgress/caseProgress.js @@ -23,7 +23,9 @@ Template.caseProgress.onCreated(() => { }; // Display the error messages - const errorHandler = data => OHIF.ui.showDialog('dialogInfo', data); + const errorHandler = data => { + OHIF.ui.showDialog('dialogInfo', Object.assign({ class: 'themed' }, data)); + }; const promise = instance.data.measurementApi.storeMeasurements(); promise.then(successHandler).catch(errorHandler);