From 525028f858585deaca944228c8374e7d5318c00c Mon Sep 17 00:00:00 2001 From: Ross Date: Fri, 12 Nov 2021 14:08:08 +0000 Subject: [PATCH] . --- rapids/templates/rapids/rapid_form.html | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/rapids/templates/rapids/rapid_form.html b/rapids/templates/rapids/rapid_form.html index 61120586..283d3112 100755 --- a/rapids/templates/rapids/rapid_form.html +++ b/rapids/templates/rapids/rapid_form.html @@ -11,7 +11,6 @@ // set to hold the files that are still being processed let active_file_inputs = new Set(); - let loading_viewer = false; async function listAllFilesAndDirs(dirHandle, files_only) { const files = []; @@ -488,13 +487,7 @@ console.log("active", active_file_inputs) // Only load once all queued files have been processed if (active_file_inputs.size < 1) { - if (loading_viewer) { - setTimeout(function () { - loadViewer(); - }, 1000); - } else { - loadViewer(); - } + loadViewer(); } } //}) @@ -562,7 +555,6 @@ } function loadViewer() { - loading_viewer = true; console.log("LOAD VIEWER") // temp fix before starting viewer collapsed $("#single-dicom-viewer").show() @@ -584,14 +576,13 @@ "detail": image_set }); - window.dispatchEvent(event); + if (active_file_inputs.length < 1) { + window.dispatchEvent(event); + } sortable('.sortable'); //sortable('.sortable')[0].addEventListener('sortstop', function(e) { updateImagePositions(); //} - setTimeout(function () { - loading_viewer = false; - }, 1000); }