a896eaed586a82640295033c0d6b2e01c7757a65
angie
Fri Feb 24 11:38:16 2017 -0800
Thanks Jonathan for pointing out my hardcoded JS links. Forming them properly...
diff --git src/hg/hgGateway/hgGateway.c src/hg/hgGateway/hgGateway.c
index 7fe472a..d030c8d 100644
--- src/hg/hgGateway/hgGateway.c
+++ src/hg/hgGateway/hgGateway.c
@@ -347,42 +347,43 @@
dyStringPrintf(dy, "window.surveyLabelImage=\"%s\";\n", jsonStringEscape(surveyLabelImage));
else
dyStringPrintf(dy, "window.surveyLabelImage=null;\n");
}
else
{
dyStringPrintf(dy, "window.surveyLink=null;\n");
dyStringPrintf(dy, "window.surveyLabel=null;\n");
dyStringPrintf(dy, "window.surveyLabelImage=null;\n");
}
dyStringPrintf(dy, "hgGateway.init();\n");
jsInline(dy->string);
dyStringFree(&dy);
-puts("");
-puts("");
-puts("");
-puts("");
+jsIncludeFile("es5-shim.4.0.3.min.js", NULL);
+jsIncludeFile("es5-sham.4.0.3.min.js", NULL);
+jsIncludeFile("lodash.3.10.0.compat.min.js", NULL);
+jsIncludeFile("cart.js", NULL);
webIncludeResourceFile("jquery-ui.css");
jsIncludeFile("jquery-ui.js", NULL);
jsIncludeFile("jquery.watermarkinput.js", NULL);
jsIncludeFile("utils.js",NULL);
// Phylogenetic tree .js file, produced by dbDbTaxonomy.pl:
-char *dbDbTree = cfgOptionDefault("hgGateway.dbDbTaxonomy", "../js/dbDbTaxonomy.js");
+char *defaultDbDbTree = webTimeStampedLinkToResource("dbDbTaxonomy.js", FALSE);
+char *dbDbTree = cfgOptionDefault("hgGateway.dbDbTaxonomy", defaultDbDbTree);
if (isNotEmpty(dbDbTree))
printf("\n", dbDbTree);
// Main JS for hgGateway:
jsIncludeFile("hgGateway.js", NULL);
webIncludeFile("inc/jWestFooter.html");
cartFlushHubWarnings();
webEndJWest();
}
void doMiddle(struct cart *theCart)
/* Depending on invocation, either perform a query and print out results