82b708668f8be81961f2eda11562f3318f4359fc tdreszer Mon Aug 9 10:33:02 2010 -0700 Added checkboxes to searchTracks diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 2eb1239..ff14168 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -4315,8 +4315,7 @@ } } -#ifdef CONTEXT_MENU - +#if defined(CONTEXT_MENU) || defined(TRACK_SEARCH) static void trackJson(struct dyString *trackDbJson, struct track *track, int count) { // add entry for given track to the trackDbJson string @@ -4331,8 +4330,7 @@ dyStringPrintf(trackDbJson, "\n\t\tshortLabel: '%s',\n\t\tlongLabel: '%s',\n\t\tcanPack: %d,\n\t\tvisibility: %d\n\t}", javaScriptLiteralEncode(track->shortLabel), javaScriptLiteralEncode(track->longLabel), track->canPack, track->limitedVis); } - -#endif +#endif/// defined(CONTEXT_MENU) || defined(TRACK_SEARCH) void printTrackInitJavascript(struct track *trackList) { @@ -4410,11 +4408,11 @@ boolean showTrackControls = cartUsualBoolean(cart, "trackControlsOnMain", TRUE); long thisTime = 0, lastTime = 0; char *clearButtonJavascript; -#ifdef CONTEXT_MENU +#if defined(CONTEXT_MENU) || defined(TRACK_SEARCH) struct dyString *trackDbJson = newDyString(1000); int trackDbJsonCount = 1; dyStringPrintf(trackDbJson, "<script>var trackDbJson = {\nruler: {shortLabel: 'ruler', longLabel: 'Base Position Controls', canPack: 0, visibility: %d}", rulerMode); -#endif +#endif/// defined(CONTEXT_MENU) || defined(TRACK_SEARCH) basesPerPixel = ((float)winBaseCount) / ((float)insideWidth); zoomedToBaseLevel = (winBaseCount <= insideWidth / tl.mWidth); @@ -4533,7 +4531,7 @@ thisTime = clock1000(); track->loadTime = thisTime - lastTime; } -#ifdef CONTEXT_MENU +#if defined(CONTEXT_MENU) || defined(TRACK_SEARCH) trackJson(trackDbJson, track, trackDbJsonCount++); if (trackIsCompositeWithSubtracks(track)) { @@ -4545,15 +4543,15 @@ trackJson(trackDbJson, subtrack, trackDbJsonCount++); } } -#endif +#endif///defined(CONTEXT_MENU) || defined(TRACK_SEARCH) } } -#ifdef CONTEXT_MENU +#if defined(CONTEXT_MENU) || defined(TRACK_SEARCH) dyStringAppend(trackDbJson, "}\n</script>\n"); if(!trackImgOnly) hPrintf(dyStringContents(trackDbJson)); -#endif +#endif/// defined(CONTEXT_MENU) || defined(TRACK_SEARCH) printTrackInitJavascript(trackList); @@ -5673,17 +5671,18 @@ jsIncludeFile("lowetooltip.js", NULL); #endif -#ifdef CONTEXT_MENU +#if defined(CONTEXT_MENU) || defined(TRACK_SEARCH) hPrintf("<link href='../style/jquery.contextmenu.css' rel='stylesheet' type='text/css' />\n"); hPrintf("<link href='../style/jquery-ui.css' rel='stylesheet' type='text/css' />\n"); - -jsIncludeFile("jquery-ui.js", NULL); +#ifdef CONTEXT_MENU jsIncludeFile("jquery.contextmenu.js", NULL); +#endif/// def CONTEXT_MENU +jsIncludeFile("jquery-ui.js", NULL); hPrintf("<div id='hgTrackUiDialog' style='display: none'></div>\n"); // XXXX stole this and '.hidden' from bioInt.css - needs work hPrintf("<div id='warning' class='ui-state-error ui-corner-all hidden' style='font-size: 0.75em; display: none;' onclick='$(this).hide();'><p><span class='ui-icon ui-icon-alert' style='float: left; margin-right: 0.3em;'></span><strong></strong><span id='warningText'></span> (click to hide)</p></div>\n"); -#endif +#endif/// defined(CONTEXT_MENU) || defined(TRACK_SEARCH) if (cartVarExists(cart, "chromInfoPage")) {