From 1e1cc466f4d72101b1f9e3e1a3b88494d4fb0346 Mon Sep 17 00:00:00 2001
From: Gbenga <gbengaoluwadahunsi01@gmail.com>
Date: Sat, 30 Mar 2024 16:29:21 +0800
Subject: [PATCH] Updated the heatmap.html to reflect W3C standards

---
 apps/heatmap/heatmap.html | 196 +++++++++++++++++++-------------------
 1 file changed, 99 insertions(+), 97 deletions(-)

diff --git a/apps/heatmap/heatmap.html b/apps/heatmap/heatmap.html
index 43dd0ae1c..40e814c2a 100644
--- a/apps/heatmap/heatmap.html
+++ b/apps/heatmap/heatmap.html
@@ -70,83 +70,83 @@
 
  		<!--  common js START -->
  		<!-- util.js -->
-		<script type='text/javascript' src='../../common/util.js'></script>
-		<script type='text/javascript' src='../../common/DrawHelper.js'></script>
-		<script type='text/javascript' src='../../common/simplify.js'></script>
-		<script type='text/javascript' src='../../common/paths.js'></script>
-		<script type='text/javascript' src='../../common/touchMe.js'></script>
+		<script  src='../../common/util.js'></script>
+		<script  src='../../common/DrawHelper.js'></script>
+		<script  src='../../common/simplify.js'></script>
+		<script  src='../../common/paths.js'></script>
+		<script src='../../common/touchMe.js'></script>
 		<!-- add pure-form script -->
-		<script type='text/javascript' src='../../common/pureform/document-register-element.js'></script>
-		<script type='text/javascript' src='../../common/pureform/pure-form.js'></script>
+		<script src='../../common/pureform/document-register-element.js'></script>
+		<script  src='../../common/pureform/pure-form.js'></script>
 		<!-- color picker js -->
-		<script type='text/javascript' src='../../common/colorpicker/color-picker.js'></script>
+		<script src='../../common/colorpicker/color-picker.js'></script>
 		<!-- sortable js -->
-		<script type='text/javascript' src='../../common/sortable/Sortable.js'></script>
-        <script type='text/javascript' src='../../common/rangeslider/rangeslider.js'></script>
-		<script type='text/javascript' src='../../common/ajv.js'></script>
+		<script src='../../common/sortable/Sortable.js'></script>
+        <script  src='../../common/rangeslider/rangeslider.js'></script>
+		<script src='../../common/ajv.js'></script>
 		<!-- IDB helper -->
-		<script type='text/javascript' src='../../common/idb.js'></script>
+		<script  src='../../common/idb.js'></script>
 
-		<script type='text/javascript' src='../../common/heatmapeditdatamodels.js'></script>
+		<script  src='../../common/heatmapeditdatamodels.js'></script>
 
 		<!--  common js END -->
 
 		<!--  components js START -->
 		<!-- message display js -->
-		<script type='text/javascript' src='../../components/camessage/camessage.js'></script>
+		<script  src='../../components/camessage/camessage.js'></script>
 		<!-- toolbar js -->
-		<script type='text/javascript' src='../../components/toolbar/toolbar.js'></script>
+		<script  src='../../components/toolbar/toolbar.js'></script>
 		<!-- sidemenu js -->
-		<script type='text/javascript' src='../../components/sidemenu/sidemenu.js'></script>
+		<script  src='../../components/sidemenu/sidemenu.js'></script>
 	    <!-- collapsible list js -->
-	    <script type='text/javascript' src='../../components/collapsiblelist/collapsiblelist.js'></script>
+	    <script  src='../../components/collapsiblelist/collapsiblelist.js'></script>
 		<!-- layers controller js -->
-		<script type='text/javascript' src='../../components/layersviewer/layersviewer.js'></script>
+		<script  src='../../components/layersviewer/layersviewer.js'></script>
 		<!-- operation panel js -->
-		<script type='text/javascript' src='../../components/operationpanel/operationpanel.js'></script>
+		<script  src='../../components/operationpanel/operationpanel.js'></script>
 		<!-- loading cover js -->
-		<script type='text/javascript' src='../../components/loading/loading.js'></script>
+		<script  src='../../components/loading/loading.js'></script>
 		<!-- stylecontextmenu js -->
-		<script type='text/javascript' src='../../components/simplecontextmenu/simplecontextmenu.js'></script>
+		<script src='../../components/simplecontextmenu/simplecontextmenu.js'></script>
 		<!-- popup panel js -->
-		<script type='text/javascript' src='../../components/popuppanel/popuppanel.js'></script>
+		<script src='../../components/popuppanel/popuppanel.js'></script>
 		<!-- message queue js -->
-		<script type='text/javascript' src='../../components/messagequeue/messagequeue.js'></script>
+		<script src='../../components/messagequeue/messagequeue.js'></script>
 		<!-- mult selector js -->
-		<script type='text/javascript' src='../../components/multselector/multselector.js'></script>
+		<script  src='../../components/multselector/multselector.js'></script>
 		<!-- spyglass -->
-		<script type='text/javascript' src='../../components/spyglass/spyglass.js'></script>
+		<script  src='../../components/spyglass/spyglass.js'></script>
         <!-- heatmap control -->
-        <script type='text/javascript' src='../../components/heatmapcontrol/heatmapcontrol.js'></script>
-        <script type='text/javascript' src='../../components/heatmapeditorpanel/heatmapeditorpanel.js'></script>
-        <script type='text/javascript' src='../../components/heatmapediteddatapanel/heatmapediteddatapanel.js'></script>
+        <script  src='../../components/heatmapcontrol/heatmapcontrol.js'></script>
+        <script  src='../../components/heatmapeditorpanel/heatmapeditorpanel.js'></script>
+        <script src='../../components/heatmapediteddatapanel/heatmapediteddatapanel.js'></script>
 		<!--  components js END -->
 
 
 		<!-- osd & core js START -->
-		<script type='text/javascript' src='../../core/openseadragon/openseadragon.js' ></script>
-		<script type='text/javascript' src='../../core/openseadragon-imaginghelper.min.js'></script>
-		<script type='text/javascript' src='../../core/openseadragon-scalebar.js'></script>
-		<script type='text/javascript' src='../../core/openseadragonzoomlevels.js'></script>
+		<script  src='../../core/openseadragon/openseadragon.js' ></script>
+		<script src='../../core/openseadragon-imaginghelper.min.js'></script>
+		<script  src='../../core/openseadragon-scalebar.js'></script>
+		<script  src='../../core/openseadragonzoomlevels.js'></script>
 
 		<!-- core (package/ext) libs -->
-		<script type='text/javascript' src='../../core/StatesHelper.js'></script>
-		<script type='text/javascript' src='../../core/Validation.js'></script>
-		<script type='text/javascript' src='../../core/Store.js'></script>
-		<script type='text/javascript' src='../../core/CaMic.js'></script>
+		<script  src='../../core/StatesHelper.js'></script>
+		<script src='../../core/Validation.js'></script>
+		<script  src='../../core/Store.js'></script>
+		<script  src='../../core/CaMic.js'></script>
 
-		<script type='text/javascript' src='../../core/extension/openseadragon-canvas-draw-overlay.js'></script>
-		<script type='text/javascript' src='../../core/extension/openseadragon-overlays-manage.js'></script>
-		<script type='text/javascript' src='../../core/extension/openseadragon-measurement-tool/openseadragon-measurement-tool.js'></script>
-		<script type='text/javascript' src='../../core/extension/osd-heatmap-overlay.js'></script>
-		<script type='text/javascript' src='../../core/extension/openseadragon-zoom-control/openseadragon-zoom-control.js'></script>
+		<script  src='../../core/extension/openseadragon-canvas-draw-overlay.js'></script>
+		<script  src='../../core/extension/openseadragon-overlays-manage.js'></script>
+		<script  src='../../core/extension/openseadragon-measurement-tool/openseadragon-measurement-tool.js'></script>
+		<script src='../../core/extension/osd-heatmap-overlay.js'></script>
+		<script  src='../../core/extension/openseadragon-zoom-control/openseadragon-zoom-control.js'></script>
 
 
 		<!-- business js -->
-		<script type='text/javascript' src='../../common/PathdbMods.js'></script>
-		<script type='text/javascript' src='../../common/LocalStore.js'></script>
-		<script type='text/javascript' src='../../common/NanoBorbMods.js'></script>
-		<script type='text/javascript' src='../../common/dynamicLoadScript.js'></script>
+		<script src='../../common/PathdbMods.js'></script>
+		<script  src='../../common/LocalStore.js'></script>
+		<script  src='../../common/NanoBorbMods.js'></script>
+		<script src='../../common/dynamicLoadScript.js'></script>
 		<script src='./uicallbacks.js'></script>
 		<!-- <script src='./dataloaders.js'></script> -->
 		<script src='./init.js'></script>
@@ -156,8 +156,8 @@
     <script src="https://unpkg.com/tippy.js@6"></script>
 
 		<!-- Smartpen -->
-	  <script type="text/javascript" src="../../common/enhance.js"></script>
-	  <script type="text/javascript" src="../../common/smartpen/autoalign.js"></script>
+	  <script  src="../../common/enhance.js"></script>
+	  <script  src="../../common/smartpen/autoalign.js"></script>
 		<link rel="stylesheet" type="text/css" media="all" href="../../common/smartpen/autoalign.css"/>
 		<!-- Smartpen end -->
 
@@ -188,55 +188,57 @@
         <!-- overlayer manager -->
         <!-- <div id='overlayers' style='z-index:600'></div> -->
 
+
+		<script >
+			//Loading.open(document.body, 'CaMicroscope is initializing...');
+			// get slide id from url
+			if(detectIE()){
+				createWarningText('You are using an <strong>IE/Edge</strong> browser that may be lead to erratic behavior on caMicroscope. Please switch to <a href="https://www.google.com/chrome/">Chrome</a>, <a href="https://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.apple.com/safari/">Safari</a> browser to improve your experience.');
+			}
+			$D.params = getUrlVars();
+	
+			// load if we have at least one slide query element
+			if($D.params && $D.params.slideId && $D.params.execId){
+				// normal initialization starts
+				document.addEventListener('DOMContentLoaded', initialize);
+			}
+	
+			else if(!$D.params.execId){
+				redirect($D.pages.table,'ExecId Is Undefined. Redirecting To Table.');
+			}
+	
+			else if ($D.params && ($D.params.slide || $D.params.specimen ||$D.params.study || $D.params.location)){
+				let STORE = new Store()
+				STORE.findSlide($D.params.slide, $D.params.study, $D.params.specimen, $D.params.location).then(x=>{
+					let offset = parseInt($D.params.offset,10) || 0;
+					if(x.length == 0 || offset >= x.length){
+						redirect($D.pages.table,'No Slide Found. Redirecting To Table.');
+					} else {
+						newParams = $D.params
+						delete newParams.data
+						delete newParams.slide
+						delete newParams.location
+						delete newParams.offset
+						newParams.slideId = x[offset]['_id']['$oid']
+						newUrl = window.location.href.split("?")[0] + "?" + objToParamStr(newParams)
+						window.location.href = newUrl
+					}
+				}).catch(e=>{
+					console.warn(e)
+					redirect($D.pages.table,'Redirecting To Table.');
+				})
+				// find the associated slideID
+				// open viewer with that slideID
+			}
+			else {
+				redirect($D.pages.table,'Slide Is Undefined. Redirecting To Table.');
+			}
+	
+			// get states parameters
+			if($D.params.states){
+				$D.params.states = StatesHelper.decodeStates($D.params.states);
+			}
+		</script>
 	</body>
-	<script type="text/javascript">
-		//Loading.open(document.body, 'CaMicroscope is initializing...');
-		// get slide id from url
-		if(detectIE()){
-			createWarningText('You are using an <strong>IE/Edge</strong> browser that may be lead to erratic behavior on caMicroscope. Please switch to <a href="https://www.google.com/chrome/">Chrome</a>, <a href="https://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.apple.com/safari/">Safari</a> browser to improve your experience.');
-		}
-		$D.params = getUrlVars();
-
-		// load if we have at least one slide query element
-		if($D.params && $D.params.slideId && $D.params.execId){
-			// normal initialization starts
-			document.addEventListener('DOMContentLoaded', initialize);
-		}
-
-		else if(!$D.params.execId){
-			redirect($D.pages.table,'ExecId Is Undefined. Redirecting To Table.');
-		}
-
-		else if ($D.params && ($D.params.slide || $D.params.specimen ||$D.params.study || $D.params.location)){
-			let STORE = new Store()
-			STORE.findSlide($D.params.slide, $D.params.study, $D.params.specimen, $D.params.location).then(x=>{
-				let offset = parseInt($D.params.offset,10) || 0;
-				if(x.length == 0 || offset >= x.length){
-					redirect($D.pages.table,'No Slide Found. Redirecting To Table.');
-				} else {
-					newParams = $D.params
-					delete newParams.data
-					delete newParams.slide
-					delete newParams.location
-					delete newParams.offset
-					newParams.slideId = x[offset]['_id']['$oid']
-					newUrl = window.location.href.split("?")[0] + "?" + objToParamStr(newParams)
-					window.location.href = newUrl
-				}
-			}).catch(e=>{
-				console.warn(e)
-				redirect($D.pages.table,'Redirecting To Table.');
-			})
-			// find the associated slideID
-			// open viewer with that slideID
-		}
-		else {
-			redirect($D.pages.table,'Slide Is Undefined. Redirecting To Table.');
-		}
-
-		// get states parameters
-		if($D.params.states){
-			$D.params.states = StatesHelper.decodeStates($D.params.states);
-		}
-	</script>
+	
 </html>