From 5d5df29e092bdd9578491adc6e82286bb0ea2975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elo=C3=ADzio=20Salgado?= <eloisalgado@gmail.com>
Date: Wed, 8 Feb 2017 16:54:32 -0200
Subject: [PATCH] Improvements for imageSlider and cineDialog components.
 Rolling back default protocol (HP) configurations

---
 Packages/ohif-hanging-protocols/both/testData.js           | 2 +-
 .../client/components/viewer/cineDialog/cineDialog.js      | 2 +-
 .../components/viewer/imageControls/imageControls.js       | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Packages/ohif-hanging-protocols/both/testData.js b/Packages/ohif-hanging-protocols/both/testData.js
index 88d741108..2d6ac5d8c 100644
--- a/Packages/ohif-hanging-protocols/both/testData.js
+++ b/Packages/ohif-hanging-protocols/both/testData.js
@@ -5,7 +5,7 @@ function getDefaultProtocol() {
 
     var oneByOne = new HP.ViewportStructure('grid', {
         rows: 1,
-        columns: 2
+        columns: 1
     });
 
     var viewport = new HP.Viewport();
diff --git a/Packages/ohif-viewerbase/client/components/viewer/cineDialog/cineDialog.js b/Packages/ohif-viewerbase/client/components/viewer/cineDialog/cineDialog.js
index 1e35859bc..a119f7c70 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/cineDialog/cineDialog.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/cineDialog/cineDialog.js
@@ -268,7 +268,7 @@ Template.cineDialog.events({
         }
     },
 
-    'input [data-key=framesPerSecond] input'(event, instance) {
+    'input [data-key=framesPerSecond] input, change [data-key=framesPerSecond] input'(event, instance) {
         // Update the FPS text onscreen
         const rate = parseFloat($(event.currentTarget).val());
         instance.updateFramerate(rate);
diff --git a/Packages/ohif-viewerbase/client/components/viewer/imageControls/imageControls.js b/Packages/ohif-viewerbase/client/components/viewer/imageControls/imageControls.js
index abab6e649..3cdc3a88a 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/imageControls/imageControls.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/imageControls/imageControls.js
@@ -19,13 +19,10 @@ Template.imageControls.onRendered(() => {
 })
 
 Template.imageControls.events({
-    'keydown #imageSlider'(event) {
+    'keydown input[type=range]'(event) {
         // We don't allow direct keyboard up/down input on the
         // image sliders since the natural direction is reversed (0 is at the top)
 
-        // Prevent the browser's default behaviour (scrolling)
-        event.preventDefault();
-
         // Store the KeyCodes in an object for readability
         const keys = {
             DOWN: 40,
@@ -34,8 +31,10 @@ Template.imageControls.events({
 
         if (event.which === keys.DOWN) {
             OHIF.viewer.hotkeyFunctions.scrollDown();
+            event.preventDefault();
         } else if (event.which === keys.UP) {
             OHIF.viewer.hotkeyFunctions.scrollUp();
+            event.preventDefault();
         }
     },
     'input input[type=range], change input[type=range]'(event) {