Merge branch 'feature-WG-87' into 'development'

Web-GDE/src/captureMetrics/captureMetrics.js

@@ -5,8 +5,8 @@ let time_pause = 0
 let time_pause_spent = 0
 
 const conflicts = ['F', 'f', 'alphabet', 'alphanumeric']
-const shift_shortcuts = ['+', '_', 'ArrowLeft', 'ArrowRight', 'f', 'F']
-const ctrl_shortcuts = ['.', ',', 'ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown']
+const shift_shortcuts = ['f', 'F']
+const ctrl_shortcuts = ['PageUp', 'PageDown', 'ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown', '-', '=']
 const ctrl_shift_shortcuts = ['v', 'h', 'V', 'H']
 const shortcut_triggers = ['Shift', 'Control']
 let shortcut_flag = false

Web-GDE/src/tiffViewer/tiffViewer.js

@@ -337,7 +337,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   const rotateR = document.getElementById("TiffViewer_RotateR");
   rotateR.addEventListener("click", rotateClockwise);
   document.addEventListener("keydown", (e) => {
-    if (e.ctrlKey && e.key === ".") {
+    if (e.shiftKey && e.key === "PageUp") {
       e.preventDefault();
       rotateClockwise();
     }
@@ -354,7 +354,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   const rotateL = document.getElementById("TiffViewer_RotateL");
   rotateL.addEventListener("click", rotateCounterClockwise);
   document.addEventListener("keydown", (e) => {
-    if (e.ctrlKey && e.key === ",") {
+    if (e.shiftKey && e.key === "PageDown") {
       e.preventDefault();
       rotateCounterClockwise();
     }
@@ -375,7 +375,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   const zoomP = document.getElementById("TiffViewer_ZoomP");
   zoomP.addEventListener("click", zoomIn);
   document.addEventListener("keydown", (e) => {
-    if (e.shiftKey && e.key === "+") {
+    if (e.ctrlKey && e.key === "=") {
       e.preventDefault();
       zoomIn();
     }
@@ -390,7 +390,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   const zoomM = document.getElementById("TiffViewer_ZoomM");
   zoomM.addEventListener("click", zoomOut);
   document.addEventListener("keydown", (e) => {
-    if (e.shiftKey && e.key == "_") {
+    if (e.ctrlKey && e.key === "-") {
       e.preventDefault();
       zoomOut();
     }
@@ -410,7 +410,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   const prevB = document.getElementById("TiffViewer_PrevButton");
   prevB.addEventListener("click", previousPage);
   document.addEventListener("keydown", (e) => {
-    if (e.shiftKey && e.keyCode == 37) {
+    if (e.key === "F11") {
       e.preventDefault();
       previousPage();
 
@@ -432,7 +432,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   const nextB = document.getElementById("TiffViewer_NextButton");
   nextB.addEventListener("click", nextPage);
   document.addEventListener("keydown", (e) => {
-    if (e.shiftKey && e.keyCode == 39) {
+    if (e.key === "F12") {
       e.preventDefault();
       nextPage();
     }