80734761c153225c6a86b59149bbf75a9504ed11
tdreszer
Wed Nov 16 11:35:06 2011 -0800
Getting rid of the last vestiges of NEW_JQUERY ifdef.
diff --git src/hg/hgTracks/searchTracks.c src/hg/hgTracks/searchTracks.c
index 086921d..9c8198a 100644
--- src/hg/hgTracks/searchTracks.c
+++ src/hg/hgTracks/searchTracks.c
@@ -544,37 +544,31 @@
hPrintf("
Tracks so marked are containers which group related data tracks. Containers may need additional configuration (by clicking on the
icon) before they can be viewed in the browser.
\n");
//hPrintf("* Tracks so marked are containers which group related data tracks. These may not be visible unless further configuration is done. Click on the * to configure these.
\n");
hPrintf("\n\n");
// be done with json
jsonTdbSettingsUse(jsonTdbVars);
}
hPrintf(""); // This div allows the clear button to empty it
}
void doSearchTracks(struct group *groupList)
{
webIncludeResourceFile("ui.dropdownchecklist.css");
jsIncludeFile("ui.dropdownchecklist.js",NULL);
// This line is needed to get the multi-selects initialized
-#ifdef NEW_JQUERY
jsIncludeFile("ddcl.js",NULL);
-hPrintf("\n");
-#else///ifndef NEW_JQUERY
-hPrintf("\n");
-hPrintf("\n");
-#endif///ndef NEW_JQUERY
struct group *group;
char *groups[128];
char *labels[128];
int numGroups = 1;
groups[0] = ANYLABEL;
labels[0] = ANYLABEL;
char *nameSearch = cartOptionalString(cart, TRACK_SEARCH_ON_NAME);
char *typeSearch = cartUsualString( cart, TRACK_SEARCH_ON_TYPE,ANYLABEL);
char *simpleEntry = cartOptionalString(cart, TRACK_SEARCH_SIMPLE);
char *descSearch = cartOptionalString(cart, TRACK_SEARCH_ON_DESCR);
char *groupSearch = cartUsualString( cart, TRACK_SEARCH_ON_GROUP,ANYLABEL);
boolean doSearch = sameString(cartOptionalString(cart, TRACK_SEARCH), "Search") || cartUsualInt(cart, TRACK_SEARCH_PAGER, -1) >= 0;
struct sqlConnection *conn = hAllocConn(database);
boolean metaDbExists = sqlTableExists(conn, "metaDb");