othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BugFix(#183): Avoid adding focus on a viewport that is already activated (#265)

Browse Source
This commit is contained in:
Gustavo André Lelis 2018-09-06 15:28:26 -03:00 committed by Bruno Alves de Faria
parent 2493802dea
commit 2f1a2273a4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
View File

@ -400,7 +400,6 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
const element = (eventData && eventData.element) || (event && event.currentTarget); const element = (eventData && eventData.element) || (event && event.currentTarget);
if (!element) return; if (!element) return;
const $element = $(element); const $element = $(element);
$element.focus();
// Stop here if we don't have eventData set // Stop here if we don't have eventData set
if (!eventData) return; if (!eventData) return;
@ -411,6 +410,8 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
const activeViewportIndex = Session.get('activeViewport'); const activeViewportIndex = Session.get('activeViewport');
if (viewportIndex === activeViewportIndex) return; if (viewportIndex === activeViewportIndex) return;
$element.focus();
OHIF.log.info('imageViewerViewport sendActivationTrigger'); OHIF.log.info('imageViewerViewport sendActivationTrigger');
// Otherwise, trigger an 'OHIFActivateViewport' event to be handled by the Template event // Otherwise, trigger an 'OHIFActivateViewport' event to be handled by the Template event