Merge branch 'feature-adhoc' into 'development'

Web-GDE/src/highlight/highlight.js

@@ -79,7 +79,7 @@ function flipYHighlightCanvas(idVal){
 
 
 
-document.addEventListener("DOMContentLoaded", function(event) {
+function initHighlight() {
     //tab traversal event listener
     $(document).on('keyup', '.select2.select2-container', function (e) {
         if (e.which == 9) {
@@ -208,7 +208,7 @@ document.addEventListener("DOMContentLoaded", function(event) {
     });
 
 
-});
+};
 
 
 fetch("./src/highlight/dbSchema_anno.xlsx")

Web-GDE/src/submit/submit.js

@@ -55,6 +55,7 @@ const submitForm = (e) => {
             });
             document.getElementById("counter").innerHTML = "";
             clearTimeout(interval);
+            isCanvasNotCreated = true;
             init();
             return true
         }

Web-GDE/src/tiffViewer/tiffViewer.js

@@ -594,7 +594,6 @@ function TIFFViewer(xhr, TiffViewerImageName) {
       }else{
         fitResize();
       }
-      
     }});
 
     //scrolling shortcuts
@@ -614,6 +613,6 @@ function TIFFViewer(xhr, TiffViewerImageName) {
         div.scrollTop += 20;
       }
     });
-
+    initHighlight();
   }