80734761c153225c6a86b59149bbf75a9504ed11
tdreszer
Wed Nov 16 11:35:06 2011 -0800
Getting rid of the last vestiges of NEW_JQUERY ifdef.
diff --git src/hg/lib/fileUi.c src/hg/lib/fileUi.c
index a2c0da2..a19f1c2 100644
--- src/hg/lib/fileUi.c
+++ src/hg/lib/fileUi.c
@@ -519,68 +519,58 @@
slPairAdd(&tagLabelPairs,tag,cloneString((char *)cvLabel(var,term->name)));
slNameFree(&term);
}
// If there is more than one val for this var then create filterBy box for it
if (slCount(tagLabelPairs) > 1)
{
// should have a list sorted on the label
enum cvDataType eCvDataType = cvDataType(var);
if (eCvDataType == cvInteger)
slPairValAtoiSort(&tagLabelPairs);
else
slPairValSortCase(&tagLabelPairs);
char extraClasses[256];
safef(extraClasses,sizeof extraClasses,"filterTable %s",var);
- #ifdef NEW_JQUERY
char *dropDownHtml = cgiMakeMultiSelectDropList(var,tagLabelPairs,NULL,"All",extraClasses,"onchange='filterTable(this);' style='font-size:.9em;'");
- #else///ifndef NEW_JQUERY
- char *dropDownHtml = cgiMakeMultiSelectDropList(var,tagLabelPairs,NULL,"All",extraClasses,"onchange='filterTable();' onclick='filterTableExclude(this);'");
- #endif///ndef NEW_JQUERY
// Note filterBox has classes: filterBy & {var}
if (dropDownHtml)
{
dyStringPrintf(dyFilters,"
\n%s: \n%s | | \n",
labelWithVocabLink(var,sortOrder->title[sIx],tagLabelPairs,TRUE),dropDownHtml); // TRUE were sending tags, not values
freeMem(dropDownHtml);
count++;
if (sIx < 32) // avoid bit overflow but 32 filterBoxes? I don't think so
filterableBits |= (0x1<<(sIx));
}
}
if (tagLabelPairs != NULL)
slPairFreeValsAndList(&tagLabelPairs);
}
// Finally ready to print the filterBys out
if (count)
{
webIncludeResourceFile("ui.dropdownchecklist.css");
jsIncludeFile("ui.dropdownchecklist.js",NULL);
#define FILTERBY_HELP_LINK "help"
cgiDown(0.9);
printf("Filter files by: (select multiple %sitems - %s)\n\n",
(count >= 1 ? "categories and ":""),FILTERBY_HELP_LINK);
printf("%s\n",dyStringContents(dyFilters));
printf("
\n");
- #ifdef NEW_JQUERY
jsIncludeFile("ddcl.js",NULL);
- printf("\n");
- #else///ifndef NEW_JQUERY
- printf("\n");
- printf("\n");
- #endif///ndef NEW_JQUERY
}
dyStringFree(&dyFilters);
}
return filterableBits;
}
static void filesDownloadsPreamble(char *db, struct trackDb *tdb)
// Replacement for preamble.html which should expose parent dir, files.txt and supplemental, but
// not have any specialized notes per composite. Specialized notes belong in track description.
{
char *server = hDownloadsServer();
char *subDir = "";
if (hIsBetaHost())
{
server = "hgdownload-test.cse.ucsc.edu"; // NOTE: Force this case because beta may think