Merge pull request #156 from camicroscope/release

For 3.1.0

apps/heatmap/heatmap.html

@@ -72,6 +72,8 @@
 		<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>
+		<!-- IDB helper -->
+		<script type='text/javascript' src='../../common/idb.js'></script>
 
 		<!--  common js END -->
 
@@ -125,7 +127,7 @@
 
 
 		<!-- business js -->
-		<script src="../../dist/packages.js"></script>
+		<script type='text/javascript' src='../../common/dynamicLoadScript.js'></script>
 		<script src='./uicallbacks.js'></script>
 		<!-- <script src='./dataloaders.js'></script> -->
 		<script src='./init.js'></script>
@@ -169,9 +171,11 @@
 			// 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=>{

apps/heatmap/init.js

@@ -15,17 +15,18 @@ const $D = {
   templates:null // json schema for prue-form
 };
 
-
 // initialize viewer page
 function initialize(){
-
-  // init UI -- some of them need to wait data loader to load data
-  // because UI components need data to initialize
-  initUIcomponents();
-
-  // create a viewer and set up
-  initCore();
-
+  var checkPackageIsReady = setInterval(function () {
+    if(IsPackageLoading) {
+      clearInterval(checkPackageIsReady);
+      // init UI -- some of them need to wait data loader to load data
+      // because UI components need data to initialize
+      initUIcomponents();
+      // create a viewer and set up
+      initCore();
+    }
+  }, 100);
   // loading the form template data
   //FormTempaltesLoader();
 
@@ -203,8 +204,8 @@ function initCore(){
         });
 
         $UI.settingsSideMenu.addContent($UI.heatmapcontrol.elt);
-
         Loading.close();
+
       }
     }, 500);
   });
@@ -324,6 +325,25 @@ function initUIcomponents(){
         value:'dbviewers',
         type:'check',
         callback:toggleViewerMode
+      },{
+        icon: 'insert_photo',
+        type: 'btn',
+        value: 'viewer',
+        title: 'Viewer',
+        callback: function () {
+          if (window.location.search.length > 0) {
+            window.location.href = '../viewer/viewer.html' + window.location.search;
+          } else {
+            window.location.href = '../viewer/viewer.html';
+          }
+        }
+      },{
+        name:'bugs',
+        icon: 'bug_report',
+        title: 'Bug Report',
+        value: 'bugs',
+        type: 'btn',
+        callback: ()=>{window.open('https://goo.gl/forms/mgyhx4ADH0UuEQJ53','_blank').focus()}
       }
 
     ]