782c81418b4a7b3194393adf3efde7b868b61589 angie Wed Mar 1 11:54:05 2017 -0800 Replacing some more hardcoded ../js/ paths with calls to jsIncludeFile. diff --git src/hg/lib/jsHelper.c src/hg/lib/jsHelper.c index e80ae35..3581d50 100644 --- src/hg/lib/jsHelper.c +++ src/hg/lib/jsHelper.c @@ -238,48 +238,48 @@ noScriptMsg = "<b>JavaScript is disabled in your web browser</b></p><p>You must have JavaScript enabled in your web browser to use the Genome Browser"; defaultWarningShown = TRUE; } if(noScriptMsg && strlen(noScriptMsg)) hPrintf("<noscript><div class='noscript'><div class='noscript-inner'><p>%s</p></div></div></noscript>\n", noScriptMsg); hPrintf("%s",link); freeMem(link); } } void jsIncludeReactLibs() /* Prints out <script src="..."> tags for external libraries including ReactJS & ImmutableJS * and our own model libs, React mixins and components. */ { // We need a module system... webpack? -puts("<script src=\"../js/es5-shim.4.0.3.min.js\"></script>"); -puts("<script src=\"../js/es5-sham.4.0.3.min.js\"></script>"); -puts("<script src=\"../js/lodash.3.10.0.compat.min.js\"></script>"); +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); puts("<script src=\"//code.jquery.com/jquery-1.9.1.min.js\"></script>"); puts("<script src=\"//code.jquery.com/ui/1.10.3/jquery-ui.min.js\"></script>"); -puts("<script src=\"../js/react-with-addons-0.12.2.min.js\"></script>"); -puts("<script src=\"../js/immutable.3.7.4.min.js\"></script>"); -puts("<script src=\"../js/jquery.bifrost.1.0.1.min.js\"></script>"); -puts("<script src=\"../js/BackboneExtend.js\"></script>"); -puts("<script src=\"../js/cart.js\"></script>"); -puts("<script src=\"../js/ImModel.js\"></script>"); -puts("<script src=\"../js/CladeOrgDbMixin.js\"></script>"); -puts("<script src=\"../js/PositionSearchMixin.js\"></script>"); -puts("<script src=\"../js/UserRegionsMixin.js\"></script>"); -puts("<script src=\"../js/PathUpdate.js\"></script>"); -puts("<script src=\"../js/PathUpdateOptional.js\"></script>"); -puts("<script src=\"../js/ImmutableUpdate.js\"></script>"); -puts("<script src=\"../js/reactLibBundle.js\"></script>"); +jsIncludeFile("react-with-addons-0.12.2.min.js", NULL); +jsIncludeFile("immutable.3.7.4.min.js", NULL); +jsIncludeFile("jquery.bifrost.1.0.1.min.js", NULL); +jsIncludeFile("BackboneExtend.js", NULL); +jsIncludeFile("cart.js", NULL); +jsIncludeFile("ImModel.js", NULL); +jsIncludeFile("CladeOrgDbMixin.js", NULL); +jsIncludeFile("PositionSearchMixin.js", NULL); +jsIncludeFile("UserRegionsMixin.js", NULL); +jsIncludeFile("PathUpdate.js", NULL); +jsIncludeFile("PathUpdateOptional.js", NULL); +jsIncludeFile("ImmutableUpdate.js", NULL); +jsIncludeFile("reactLibBundle.js", NULL); } void jsIncludeDataTablesLibs() /* Prints out <script src="..."> tags for external libraries: jQuery 1.12.3, the jQuery DataTables * plugin (version 1.10.12), and the accompanying standard CSS file for DataTables. */ { puts("<link rel=\"stylesheet\" type=\"text/css\" " "href=\"https://cdn.datatables.net/1.10.12/css/jquery.dataTables.min.css\">\n"); puts("<script type=\"text/javascript\" " "src=\"https://code.jquery.com/jquery-1.12.3.min.js\"\"></script>"); puts("<script type=\"text/javascript\" " "src=\"https://cdn.datatables.net/1.10.12/js/jquery.dataTables.min.js\"\"></script>"); } char *jsDataTableStateSave (char *cartPrefix)