.

rapids/templates/rapids/rapid_form.html

@@ -11,8 +11,7 @@
 
     // set to hold the files that are still being processed
     let active_file_inputs = new Set();
-
+    let load_viewer = false;
-    window.loading_viewer = false;
 
     async function listAllFilesAndDirs(dirHandle, files_only) {
         const files = [];
@@ -489,7 +488,8 @@
             console.log("active", active_file_inputs)
             // Only load once all queued files have been processed
             if (active_file_inputs.size < 1) {
-                loadViewer();
+                load_viewer = true;
+                //loadViewer();
             }
         }
         //})
@@ -540,10 +540,6 @@
                 console.log("active", active_file_inputs)
                 // Only load once all queued files have been processed
                 if (active_file_inputs.size < 1) {
-                    while (window.loading_viewer) {
-                        print("loading viewer")
-                        
-                    }
                     loadViewer();
                 }
             });
@@ -560,8 +556,14 @@
         })
     }
 
+    const viewLoadChecker = setInterval(function() {
+        if (load_viewer) {
+            load_viewer = false;
+            loadViewer();
+        }
+    }, 2000);
+
     function loadViewer() {
-        window.loading_viewer = true;
         console.log("LOAD VIEWER")
         // temp fix before starting viewer collapsed
         $("#single-dicom-viewer").show()
@@ -588,9 +590,6 @@
         //sortable('.sortable')[0].addEventListener('sortstop', function(e) {
         updateImagePositions();
         //}
-        setTimeout(function () {
-            window.loading_viewer = false
-        }, 1000);
 
     }