From c023b35bd3a2c1597986ad9d11b233be237313f0 Mon Sep 17 00:00:00 2001 From: Aysel Afsar Date: Fri, 15 Jan 2016 22:33:18 -0500 Subject: [PATCH] LT-127: Enable to scroll fluidly through images in FF and IE (WIP) --- Packages/cornerstone/client/cornerstoneMath.js | 2 +- .../client/components/viewer/imageControls/imageControls.js | 2 +- Packages/viewerbase/lib/setActiveViewport.js | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Packages/cornerstone/client/cornerstoneMath.js b/Packages/cornerstone/client/cornerstoneMath.js index 292fa5fd2..71b32da5b 100644 --- a/Packages/cornerstone/client/cornerstoneMath.js +++ b/Packages/cornerstone/client/cornerstoneMath.js @@ -1026,7 +1026,7 @@ var cornerstoneMath = (function (cornerstoneMath) { if (r1 !== 0 && r2 !== 0 && cornerstoneMath.sign(r1) === cornerstoneMath.sign(r2)) { - return + return; } /* Line segments intersect: compute intersection point. diff --git a/Packages/viewerbase/client/components/viewer/imageControls/imageControls.js b/Packages/viewerbase/client/components/viewer/imageControls/imageControls.js index d64331723..befc98885 100644 --- a/Packages/viewerbase/client/components/viewer/imageControls/imageControls.js +++ b/Packages/viewerbase/client/components/viewer/imageControls/imageControls.js @@ -1,5 +1,5 @@ Template.imageControls.events({ - 'input #imageSlider': function(e) { + 'change #imageSlider': function(e) { // Using the slider in an inactive viewport // should cause that viewport to become active var slider = $(e.currentTarget); diff --git a/Packages/viewerbase/lib/setActiveViewport.js b/Packages/viewerbase/lib/setActiveViewport.js index 222e30355..1b4660f0d 100644 --- a/Packages/viewerbase/lib/setActiveViewport.js +++ b/Packages/viewerbase/lib/setActiveViewport.js @@ -19,5 +19,7 @@ setActiveViewport = function(element) { displayReferenceLines(element); // Set the div to focused, so keypress events are handled - $(element).focus(); + //$(element).focus(); + //.focus() event breaks in FF&IE + $(element).triggerHandler("focus"); }; \ No newline at end of file