29621ad38b4b62e7807e84269fd198ca3dd9173c larrym Wed Mar 23 15:10:17 2011 -0700 some more NEW_JQUERY stuff - dead code all trees unless explicitly turned on (redmine 2813) diff --git src/hg/hgGateway/hgGateway.c src/hg/hgGateway/hgGateway.c index dbbae3a..30468ec 100644 --- src/hg/hgGateway/hgGateway.c +++ src/hg/hgGateway/hgGateway.c @@ -45,31 +45,36 @@ char *onChangeOrg = "onchange=\"document.orgForm.org.value = document.mainForm.org.options[document.mainForm.org.selectedIndex].value; document.orgForm.db.value = 0; document.orgForm.submit();\""; char *onChangeClade = "onchange=\"document.orgForm.clade.value = document.mainForm.clade.options[document.mainForm.clade.selectedIndex].value; document.orgForm.org.value = 0; document.orgForm.db.value = 0; document.orgForm.submit();\""; /* If we are changing databases via explicit cgi request, then remove custom track data which will be irrelevant in this new database . If databases were changed then use the new default position too. */ if (sameString(position, "genome") || sameString(position, "hgBatch")) position = defaultPosition; webIncludeResourceFile("autocomplete.css"); jsIncludeFile("jquery.js", NULL); +#ifdef NEW_JQUERY +webIncludeResourceFile("jquery-ui.css"); +jsIncludeFile("jquery-ui.js", NULL); +#else jsIncludeFile("jquery.autocomplete.js", NULL); +#endif jsIncludeFile("ajax.js", NULL); jsIncludeFile("autocomplete.js", NULL); jsIncludeFile("hgGateway.js", NULL); jsIncludeFile("utils.js", NULL); puts( "<CENTER>" "<TABLE BGCOLOR=\"#FFFEE8\" BORDERCOLOR=\"cccc99\" BORDER=0 CELLPADDING=1>\n" "<TR><TD>\n" "<CENTER><FONT SIZE=\"2\">\n" "The UCSC Genome Browser was created by the \n" "<A HREF=\"../staff.html\">Genome Bioinformatics Group of UC Santa Cruz</A>.\n" "<BR>" "Software Copyright (c) The Regents of the University of California.\n" "All rights reserved.\n" @@ -214,30 +219,33 @@ puts("<TD VALIGN=\"TOP\">"); if(supportsSuggest) cgiMakeOnClickButton("document.mainForm.position.value=''; document.getElementById('suggest').value='';", "clear position"); else cgiMakeOnClickButton("document.mainForm.position.value=''", "clear position"); puts("</TD>"); puts("</TR></TABLE>"); puts("</center>\n" "</td></tr></table>\n" "</td></tr></table>\n" "</td></tr></table>\n" ); puts("</center>"); +#ifdef NEW_JQUERY +hPrintf("<input type='hidden' id='hgt.newJQuery' name='hgt.newJQuery' value='1'>\n"); +#endif puts("</FORM>"); if (hIsPreviewHost()) { puts("<P>" "WARNING: This is our preview site. It is a weekly mirror of our internal development server for public access. " "Data and tools here are under construction, have not been quality reviewed, and are subject to change " "at any time. We provide this site for early access, with the warning that it is less available " "and stable than our public site. For high-quality reviewed annotations on our production server, visit " " <A HREF=\"http://genome.ucsc.edu\">http://genome.ucsc.edu</A>." "</P><BR>"); } else if (hIsPrivateHost()) { puts("<P>WARNING: This is our development and test site. It usually works, but it is filled with tracks in various " "stages of construction, and others of little interest to people outside of our local group. "