Ticket 49469: Improve loading of JS dependencies (#131)

LabKey · Jan 26, 2024 · dae001c · dae001c
1 parent aefa956
commit dae001c
Show file tree

Hide file tree

Showing 44 changed files with 128 additions and 140 deletions.
diff --git a/OConnor/resources/views/AnimalList.html b/OConnor/resources/views/AnimalList.html
@@ -1,9 +1,6 @@
 
 <script type="text/javascript">
 
-LABKEY.requiresScript('oconnor/moreInfo.js');
-
-
 Ext.onReady(main);
 
 function main(){

diff --git a/OConnor/resources/views/AnimalList.view.xml b/OConnor/resources/views/AnimalList.view.xml
@@ -3,5 +3,7 @@
        frame="none"
        >
 
-
+       <dependencies>
+              <dependency path="oconnor/moreInfo.js" />
+       </dependencies>
 </view>
diff --git a/OConnor/resources/views/BloodDraws.html b/OConnor/resources/views/BloodDraws.html
@@ -1,8 +1,6 @@
 
 <script type="text/javascript">
 
-LABKEY.requiresScript('oconnor/moreInfo.js');
-
 Ext.onReady(main);
 
 function main(){

diff --git a/OConnor/resources/views/BloodDraws.view.xml b/OConnor/resources/views/BloodDraws.view.xml
@@ -2,6 +2,8 @@
        title="Blood Draws"
        frame="none"
        >
-
-
+
+       <dependencies>
+              <dependency path="oconnor/moreInfo.js" />
+       </dependencies>
 </view>
diff --git a/OConnor/resources/views/Elispot_Matrix.html b/OConnor/resources/views/Elispot_Matrix.html
@@ -1,8 +1,6 @@
 <html>
 <script type="text/javascript">
 
-LABKEY.requiresScript('oconnor/oconnorFunctions.js');
-
 function toExperiment(experiment){
 
     LABKEY.Query.selectRows({

diff --git a/OConnor/resources/views/Elispot_Matrix.view.xml b/OConnor/resources/views/Elispot_Matrix.view.xml
@@ -2,6 +2,9 @@
        title="Matrix ELISpot Analysis"
        frame="none"
        >
-
-
+
+       <dependencies>
+              <dependency path="oconnor/oconnorFunctions.js" />
+       </dependencies>
+
 </view>
diff --git a/OConnor/resources/views/add_keyword.html b/OConnor/resources/views/add_keyword.html
@@ -1,12 +1,6 @@
 <html>
 <head>
 <script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorAlabrityConfig.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorPurchaseCommon.js");
-</script>
-<script type="text/javascript">
 Ext.onReady(function(){
 
 var pageButtons = [{text: 'Add Keyword', requiresSelection: true, handler: addKeyword}];

diff --git a/OConnor/resources/views/add_keyword.view.xml b/OConnor/resources/views/add_keyword.view.xml
@@ -0,0 +1,6 @@
+<view xmlns="http://labkey.org/data/xml/view">
+       <dependencies>
+              <dependency path="oconnor/oconnorAlabrityConfig.js" />
+              <dependency path="oconnor/oconnorPurchaseCommon.js" />
+       </dependencies>
+</view>
diff --git a/OConnor/resources/views/all_purchases.html b/OConnor/resources/views/all_purchases.html
@@ -1,12 +1,6 @@
 <html>
 <head>
 <script type="text/javascript">
-LABKEY.requiresScript("oconnor/oconnorAlabrityConfig.js");
-</script>
-<script type="text/javascript">
-LABKEY.requiresScript("oconnor/oconnorPurchaseCommon.js");
-</script>
-<script type="text/javascript">
 Ext.onReady(function(){
 
 createGrid(dbSchemaName, 'all_orders', 'all', '', 'a', 'b','');

diff --git a/OConnor/resources/views/all_purchases.view.xml b/OConnor/resources/views/all_purchases.view.xml
@@ -0,0 +1,6 @@
+<view xmlns="http://labkey.org/data/xml/view">
+       <dependencies>
+              <dependency path="oconnor/oconnorAlabrityConfig.js" />
+              <dependency path="oconnor/oconnorPurchaseCommon.js" />
+       </dependencies>
+</view>
diff --git a/OConnor/resources/views/enabled_grants.html b/OConnor/resources/views/enabled_grants.html
@@ -1,12 +1,6 @@
 <html>
 <head>
 
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorAlabrityConfig.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorPurchaseCommon.js");
-</script>
 <script type="text/javascript">
 Ext.onReady(function()
 {

diff --git a/OConnor/resources/views/enabled_grants.view.xml b/OConnor/resources/views/enabled_grants.view.xml
@@ -0,0 +1,6 @@
+<view xmlns="http://labkey.org/data/xml/view">
+       <dependencies>
+              <dependency path="oconnor/oconnorAlabrityConfig.js" />
+              <dependency path="oconnor/oconnorPurchaseCommon.js" />
+       </dependencies>
+</view>
diff --git a/OConnor/resources/views/enabled_shipping.html b/OConnor/resources/views/enabled_shipping.html
@@ -1,12 +1,6 @@
 <html>
 <head>
 <script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorAlabrityConfig.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorPurchaseCommon.js");
-</script>
-<script type="text/javascript">
 Ext.onReady(function()
 {
 var pageButtons = [{text: 'New Shipping Address', handler: newAddress}];

diff --git a/OConnor/resources/views/enabled_shipping.view.xml b/OConnor/resources/views/enabled_shipping.view.xml
@@ -1,2 +1,6 @@
-<view xmlns="http://labkey.org/data/xml/view" frame="none"> 
+<view xmlns="http://labkey.org/data/xml/view" frame="none">
+    <dependencies>
+        <dependency path="oconnor/oconnorAlabrityConfig.js" />
+        <dependency path="oconnor/oconnorPurchaseCommon.js" />
+    </dependencies>
 </view>
diff --git a/OConnor/resources/views/enabled_vendor_quotes.html b/OConnor/resources/views/enabled_vendor_quotes.html
@@ -1,12 +1,6 @@
 <html>
 <head>
 
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorAlabrityConfig.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorPurchaseCommon.js");
-</script>
 <script type="text/javascript">
 Ext.onReady(function()
 {

diff --git a/OConnor/resources/views/enabled_vendor_quotes.view.xml b/OConnor/resources/views/enabled_vendor_quotes.view.xml
@@ -0,0 +1,6 @@
+<view xmlns="http://labkey.org/data/xml/view">
+       <dependencies>
+              <dependency path="oconnor/oconnorAlabrityConfig.js" />
+              <dependency path="oconnor/oconnorPurchaseCommon.js" />
+       </dependencies>
+</view>
diff --git a/OConnor/resources/views/enabled_vendors.html b/OConnor/resources/views/enabled_vendors.html
@@ -1,12 +1,6 @@
 <html>
 <head>
 <script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorAlabrityConfig.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorPurchaseCommon.js");
-</script>
-<script type="text/javascript">
 Ext.onReady(function(){
 //draw grid for all vendors
 

diff --git a/OConnor/resources/views/enabled_vendors.view.xml b/OConnor/resources/views/enabled_vendors.view.xml
@@ -1,2 +1,6 @@
-<view xmlns="http://labkey.org/data/xml/view" frame="none"> 
+<view xmlns="http://labkey.org/data/xml/view" frame="none">
+    <dependencies>
+        <dependency path="oconnor/oconnorAlabrityConfig.js" />
+        <dependency path="oconnor/oconnorPurchaseCommon.js" />
+    </dependencies>
 </view>
diff --git a/OConnor/resources/views/grant_summary.html b/OConnor/resources/views/grant_summary.html
@@ -1,12 +1,6 @@
 <html>
 <head>
 <script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorAlabrityConfig.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorPurchaseCommon.js");
-</script>
-<script type="text/javascript">
 //wait until page contents load
 Ext.onReady(function(){
 

diff --git a/OConnor/resources/views/grant_summary.view.xml b/OConnor/resources/views/grant_summary.view.xml
@@ -0,0 +1,6 @@
+<view xmlns="http://labkey.org/data/xml/view">
+       <dependencies>
+              <dependency path="oconnor/oconnorAlabrityConfig.js" />
+              <dependency path="oconnor/oconnorPurchaseCommon.js" />
+       </dependencies>
+</view>
diff --git a/OConnor/resources/views/inventory_all_samples.html b/OConnor/resources/views/inventory_all_samples.html
@@ -1,12 +1,6 @@
 <html>
 <head>
 <script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorAlabrityConfig.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorFreezerCommon.js");
-</script>
-<script type="text/javascript">
 Ext.onReady(function(){
 
 createGrid(dbSchemaName, 'inventory', 'all_samples', 'Inventory', 'a', 'b','');

diff --git a/OConnor/resources/views/inventory_all_samples.view.xml b/OConnor/resources/views/inventory_all_samples.view.xml
@@ -0,0 +1,6 @@
+<view xmlns="http://labkey.org/data/xml/view">
+       <dependencies>
+              <dependency path="oconnor/oconnorAlabrityConfig.js" />
+              <dependency path="oconnor/oconnorFreezerCommon.js" />
+       </dependencies>
+</view>
diff --git a/OConnor/resources/views/inventory_cells_available.html b/OConnor/resources/views/inventory_cells_available.html
@@ -1,15 +1,6 @@
 <html>
 <head>
 <script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorAlabrityConfig.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorFreezerCommon.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/inventoryDrawCellsLayout.js");
-</script>
-<script type="text/javascript">
 Ext.onReady(function(){
 
 //add custom button to add specimens to inventory

diff --git a/OConnor/resources/views/inventory_cells_available.view.xml b/OConnor/resources/views/inventory_cells_available.view.xml
@@ -0,0 +1,7 @@
+<view xmlns="http://labkey.org/data/xml/view">
+       <dependencies>
+              <dependency path="oconnor/oconnorAlabrityConfig.js" />
+              <dependency path="oconnor/oconnorFreezerCommon.js" />
+              <dependency path="oconnor/inventoryDrawCellsLayout.js" />
+       </dependencies>
+</view>
diff --git a/OConnor/resources/views/inventory_dna_available.html b/OConnor/resources/views/inventory_dna_available.html
@@ -1,15 +1,6 @@
 <html>
 <head>
 <script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorAlabrityConfig.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorFreezerCommon.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/inventoryDrawPlasmidLayout.js");
-</script>
-<script type="text/javascript">
 Ext.onReady(function(){
 
 //add custom button to add specimens to inventory

diff --git a/OConnor/resources/views/inventory_dna_available.view.xml b/OConnor/resources/views/inventory_dna_available.view.xml
@@ -0,0 +1,7 @@
+<view xmlns="http://labkey.org/data/xml/view">
+       <dependencies>
+              <dependency path="oconnor/oconnorAlabrityConfig.js" />
+              <dependency path="oconnor/oconnorFreezerCommon.js" />
+              <dependency path="oconnor/inventoryDrawPlasmidLayout.js" />
+       </dependencies>
+</view>
diff --git a/OConnor/resources/views/inventory_oligo_available.html b/OConnor/resources/views/inventory_oligo_available.html
@@ -1,15 +1,6 @@
 <html>
 <head>
 <script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorAlabrityConfig.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorFreezerCommon.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/inventoryDrawOligoLayout.js");
-</script>
-<script type="text/javascript">
 Ext.onReady(function(){
 
 //add custom button to add specimens to inventory

diff --git a/OConnor/resources/views/inventory_oligo_available.view.xml b/OConnor/resources/views/inventory_oligo_available.view.xml
@@ -0,0 +1,7 @@
+<view xmlns="http://labkey.org/data/xml/view">
+       <dependencies>
+              <dependency path="oconnor/oconnorAlabrityConfig.js" />
+              <dependency path="oconnor/oconnorFreezerCommon.js" />
+              <dependency path="oconnor/inventoryDrawOligoLayout.js" />
+       </dependencies>
+</view>
diff --git a/OConnor/resources/views/inventory_virus_available.html b/OConnor/resources/views/inventory_virus_available.html
@@ -1,15 +1,6 @@
 <html>
 <head>
 <script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorAlabrityConfig.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorFreezerCommon.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/inventoryDrawVirusLayout.js");
-</script>
-<script type="text/javascript">
 Ext.onReady(function(){
 
 //add custom button to add specimens to inventory

diff --git a/OConnor/resources/views/inventory_virus_available.view.xml b/OConnor/resources/views/inventory_virus_available.view.xml
@@ -0,0 +1,7 @@
+<view xmlns="http://labkey.org/data/xml/view">
+       <dependencies>
+              <dependency path="oconnor/oconnorAlabrityConfig.js" />
+              <dependency path="oconnor/oconnorFreezerCommon.js" />
+              <dependency path="oconnor/inventoryDrawVirusLayout.js" />
+       </dependencies>
+</view>
diff --git a/OConnor/resources/views/mark_cancelled.html b/OConnor/resources/views/mark_cancelled.html
@@ -1,12 +1,6 @@
 <html>
 <head>
 <script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorAlabrityConfig.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorPurchaseCommon.js");
-</script>
-<script type="text/javascript">
 Ext.onReady(function(){
 
 var pageButtons = [{text: 'Mark as Cancelled', requiresSelection: true, handler: markCancelled}];

diff --git a/OConnor/resources/views/mark_cancelled.view.xml b/OConnor/resources/views/mark_cancelled.view.xml
@@ -0,0 +1,6 @@
+<view xmlns="http://labkey.org/data/xml/view">
+       <dependencies>
+              <dependency path="oconnor/oconnorAlabrityConfig.js" />
+              <dependency path="oconnor/oconnorPurchaseCommon.js" />
+       </dependencies>
+</view>
diff --git a/OConnor/resources/views/mark_invoiced.html b/OConnor/resources/views/mark_invoiced.html
@@ -1,12 +1,6 @@
 <html>
 <head>
 <script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorAlabrityConfig.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorPurchaseCommon.js");
-</script>
-<script type="text/javascript">
 Ext.onReady(function(){
 
 var pageButtons = [{text: 'Mark as Invoiced', requiresSelection: true, handler: markInvoiced}];

diff --git a/OConnor/resources/views/mark_invoiced.view.xml b/OConnor/resources/views/mark_invoiced.view.xml
@@ -0,0 +1,6 @@
+<view xmlns="http://labkey.org/data/xml/view">
+       <dependencies>
+              <dependency path="oconnor/oconnorAlabrityConfig.js" />
+              <dependency path="oconnor/oconnorPurchaseCommon.js" />
+       </dependencies>
+</view>
diff --git a/OConnor/resources/views/mark_ordered.html b/OConnor/resources/views/mark_ordered.html
@@ -1,12 +1,6 @@
 <html>
 <head>
 <script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorAlabrityConfig.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorPurchaseCommon.js");
-</script>
-<script type="text/javascript">
 Ext.onReady(function(){
 
 var pageButtons = [{text: 'Mark as Ordered', requiresSelection: true, handler: markOrdered}];

diff --git a/OConnor/resources/views/mark_ordered.view.xml b/OConnor/resources/views/mark_ordered.view.xml
@@ -0,0 +1,6 @@
+<view xmlns="http://labkey.org/data/xml/view">
+       <dependencies>
+              <dependency path="oconnor/oconnorAlabrityConfig.js" />
+              <dependency path="oconnor/oconnorPurchaseCommon.js" />
+       </dependencies>
+</view>
diff --git a/OConnor/resources/views/mark_received.html b/OConnor/resources/views/mark_received.html
@@ -1,12 +1,6 @@
 <html>
 <head>
 <script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorAlabrityConfig.js");
-</script>
-<script type="text/javascript">
-LABKEY.Utils.requiresScript("oconnor/oconnorPurchaseCommon.js");
-</script>
-<script type="text/javascript">
 Ext.onReady(function(){
 
 var pageButtons = [{text: 'Mark as Received', requiresSelection: true, handler: markReceived}];

diff --git a/OConnor/resources/views/mark_received.view.xml b/OConnor/resources/views/mark_received.view.xml
@@ -0,0 +1,6 @@
+<view xmlns="http://labkey.org/data/xml/view">
+       <dependencies>
+              <dependency path="oconnor/oconnorAlabrityConfig.js" />
+              <dependency path="oconnor/oconnorPurchaseCommon.js" />
+       </dependencies>
+</view>