80734761c153225c6a86b59149bbf75a9504ed11 tdreszer Wed Nov 16 11:35:06 2011 -0800 Getting rid of the last vestiges of NEW_JQUERY ifdef. diff --git src/hg/hgGateway/hgGateway.c src/hg/hgGateway/hgGateway.c index 0209a75..8ab11a5 100644 --- src/hg/hgGateway/hgGateway.c +++ src/hg/hgGateway/hgGateway.c @@ -44,39 +44,32 @@ char *onChangeDB = "onchange=\"document.orgForm.db.value = document.mainForm.db.options[document.mainForm.db.selectedIndex].value; document.orgForm.submit();\""; 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; jsIncludeFile("jquery.js", NULL); -#ifdef NEW_JQUERY webIncludeResourceFile("jquery-ui.css"); jsIncludeFile("jquery-ui.js", NULL); -printf("<script type='text/javascript'>var newJQuery=true;</script>\n"); -#else///ifndef NEW_JQUERY -webIncludeResourceFile("autocomplete.css"); -jsIncludeFile("jquery.autocomplete.js", NULL); -printf("<script type='text/javascript'>var newJQuery=false;</script>\n"); -#endif///ndef NEW_JQUERY jsIncludeFile("ajax.js", NULL); jsIncludeFile("autocomplete.js", NULL); jsIncludeFile("hgGateway.js", NULL); jsIncludeFile("utils.js", NULL); puts( "<CENTER style='font-size:small;'>" "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" "</CENTER>\n" ); @@ -209,34 +202,30 @@ // clear possition button 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" ); puts("</CENTER>"); -#ifdef NEW_JQUERY -hPrintf("<input type='hidden' id='hgt.newJQuery' name='hgt.newJQuery' value='1'>\n"); -#endif - if(!cartVarExists(cart, "pix")) // put a hidden input for pix on page so default value can be filled in on the client side hPrintf("<input type='hidden' name='pix' value=''>\n"); 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>");