Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 49472: Improve loading of JS dependencies #131

Merged
merged 1 commit into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions OConnor/resources/views/AnimalList.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@

<script type="text/javascript">

LABKEY.requiresScript('oconnor/moreInfo.js');


Ext.onReady(main);

function main(){
Expand Down
4 changes: 3 additions & 1 deletion OConnor/resources/views/AnimalList.view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
frame="none"
>


<dependencies>
<dependency path="oconnor/moreInfo.js" />
</dependencies>
</view>
2 changes: 0 additions & 2 deletions OConnor/resources/views/BloodDraws.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@

<script type="text/javascript">

LABKEY.requiresScript('oconnor/moreInfo.js');

Ext.onReady(main);

function main(){
Expand Down
6 changes: 4 additions & 2 deletions OConnor/resources/views/BloodDraws.view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
title="Blood Draws"
frame="none"
>



<dependencies>
<dependency path="oconnor/moreInfo.js" />
</dependencies>
</view>
2 changes: 0 additions & 2 deletions OConnor/resources/views/Elispot_Matrix.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<html>
<script type="text/javascript">

LABKEY.requiresScript('oconnor/oconnorFunctions.js');

function toExperiment(experiment){

LABKEY.Query.selectRows({
Expand Down
7 changes: 5 additions & 2 deletions OConnor/resources/views/Elispot_Matrix.view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
title="Matrix ELISpot Analysis"
frame="none"
>



<dependencies>
<dependency path="oconnor/oconnorFunctions.js" />
</dependencies>

</view>
6 changes: 0 additions & 6 deletions OConnor/resources/views/add_keyword.html
Original file line number Diff line number Diff line change
@@ -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}];
Expand Down
6 changes: 6 additions & 0 deletions OConnor/resources/views/add_keyword.view.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 0 additions & 6 deletions OConnor/resources/views/all_purchases.html
Original file line number Diff line number Diff line change
@@ -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','');
Expand Down
6 changes: 6 additions & 0 deletions OConnor/resources/views/all_purchases.view.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 0 additions & 6 deletions OConnor/resources/views/enabled_grants.html
Original file line number Diff line number Diff line change
@@ -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()
{
Expand Down
6 changes: 6 additions & 0 deletions OConnor/resources/views/enabled_grants.view.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 0 additions & 6 deletions OConnor/resources/views/enabled_shipping.html
Original file line number Diff line number Diff line change
@@ -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}];
Expand Down
6 changes: 5 additions & 1 deletion OConnor/resources/views/enabled_shipping.view.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 0 additions & 6 deletions OConnor/resources/views/enabled_vendor_quotes.html
Original file line number Diff line number Diff line change
@@ -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()
{
Expand Down
6 changes: 6 additions & 0 deletions OConnor/resources/views/enabled_vendor_quotes.view.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 0 additions & 6 deletions OConnor/resources/views/enabled_vendors.html
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 5 additions & 1 deletion OConnor/resources/views/enabled_vendors.view.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 0 additions & 6 deletions OConnor/resources/views/grant_summary.html
Original file line number Diff line number Diff line change
@@ -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(){

Expand Down
6 changes: 6 additions & 0 deletions OConnor/resources/views/grant_summary.view.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 0 additions & 6 deletions OConnor/resources/views/inventory_all_samples.html
Original file line number Diff line number Diff line change
@@ -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','');
Expand Down
6 changes: 6 additions & 0 deletions OConnor/resources/views/inventory_all_samples.view.xml
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 0 additions & 9 deletions OConnor/resources/views/inventory_cells_available.html
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 7 additions & 0 deletions OConnor/resources/views/inventory_cells_available.view.xml
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 0 additions & 9 deletions OConnor/resources/views/inventory_dna_available.html
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 7 additions & 0 deletions OConnor/resources/views/inventory_dna_available.view.xml
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 0 additions & 9 deletions OConnor/resources/views/inventory_oligo_available.html
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 7 additions & 0 deletions OConnor/resources/views/inventory_oligo_available.view.xml
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 0 additions & 9 deletions OConnor/resources/views/inventory_virus_available.html
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 7 additions & 0 deletions OConnor/resources/views/inventory_virus_available.view.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 0 additions & 6 deletions OConnor/resources/views/mark_cancelled.html
Original file line number Diff line number Diff line change
@@ -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}];
Expand Down
6 changes: 6 additions & 0 deletions OConnor/resources/views/mark_cancelled.view.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 0 additions & 6 deletions OConnor/resources/views/mark_invoiced.html
Original file line number Diff line number Diff line change
@@ -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}];
Expand Down
6 changes: 6 additions & 0 deletions OConnor/resources/views/mark_invoiced.view.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 0 additions & 6 deletions OConnor/resources/views/mark_ordered.html
Original file line number Diff line number Diff line change
@@ -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}];
Expand Down
6 changes: 6 additions & 0 deletions OConnor/resources/views/mark_ordered.view.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 0 additions & 6 deletions OConnor/resources/views/mark_received.html
Original file line number Diff line number Diff line change
@@ -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}];
Expand Down
6 changes: 6 additions & 0 deletions OConnor/resources/views/mark_received.view.xml
Original file line number Diff line number Diff line change
@@ -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>
Loading