782c81418b4a7b3194393adf3efde7b868b61589 angie Wed Mar 1 11:54:05 2017 -0800 Replacing some more hardcoded ../js/ paths with calls to jsIncludeFile. diff --git src/hg/hgChooseDb/hgChooseDb.c src/hg/hgChooseDb/hgChooseDb.c index bc19308..035ecce 100644 --- src/hg/hgChooseDb/hgChooseDb.c +++ src/hg/hgChooseDb/hgChooseDb.c @@ -167,32 +167,32 @@ webStartWrapperDetailedNoArgs(cart, trackHubSkipHubName(db), "", "UCSC Genome Browser Databases", TRUE, FALSE, TRUE, TRUE); // Ideally these would go in the <HEAD> puts("<link rel=\"stylesheet\" href=\"//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css\">"); puts("<link rel=\"stylesheet\" href=\"//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css\">"); puts("<div id=\"appContainer\">Loading...</div>"); // Set a global JS variable hgsid. // Plain old "var ..." doesn't work (other scripts can't see it), it has to belong to window. printf("<script>window.%s='%s';</script>\n", cartSessionVarName(), cartSessionId(cart)); jsIncludeReactLibs(); -puts("<script src=\"../js/reactHgChooseDb.js\"></script>"); -puts("<script src=\"../js/hgChooseDbModel.js\"></script>"); +jsIncludeFile("reactHgChooseDb.js", NULL); +jsIncludeFile("hgChooseDbModel.js", NULL); // Invisible form for jumping to hgTracks printf("\n<form action=\"%s\" method=%s id='mainForm'>\n", hgTracksName(), cartUsualString(cart, "formMethod", "GET")); cartSaveSession(cart); cgiMakeHiddenVar("db", db); puts("</form>"); webEnd(); } void doMiddle(struct cart *theCart) /* Depending on invocation, either perform a query and print out results * or display the main page. */ { cart = theCart;