227fc19dc27a3e27352097bea41add454088dc17 tdreszer Thu Nov 18 14:08:41 2010 -0800 Realized a little late that track->hasUi is the same as configurable. diff --git src/hg/hgTracks/imageV2.c src/hg/hgTracks/imageV2.c index 02118da..1ad4d1e 100644 --- src/hg/hgTracks/imageV2.c +++ src/hg/hgTracks/imageV2.c @@ -172,31 +172,31 @@ if (kindOfChild != kocOrphan) { struct trackDb *parentTdb = (kindOfChild == kocFolderContent ? track->tdb->parent :tdbGetContainer(track->tdb)); dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"parentTrack\": \"%s\",\n\t\t\"parentLabel\": \"%s\",", parentTdb->track, javaScriptLiteralEncode(parentTdb->shortLabel)); if (kindOfChild != kocFolderContent && !track->canPack) { dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"shouldPack\": 0,"); // default vis is full, but pack is an option track->canPack = parentTdb->canPack; } } dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"hasChildren\": %d,", slCount(track->tdb->subtracks)); // Configuring? -if (!configurable) +if (!configurable || track->hasUi == FALSE) dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"configureBy\": \"none\","); else if (sameString(trackDbSettingClosestToHomeOrDefault(track->tdb, "configureByPopup", matchRegex(track->track, "^snp[0-9]+$") || matchRegex(track->track, "^cons[0-9]+way") || matchRegex(track->track, "^multiz") ? "off" : "on"), "off")) dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"configureBy\": \"clickThrough\","); else dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"configureBy\": \"popup\","); // Remote access by URL? if (sameWord(track->tdb->type, "remote") && trackDbSetting(track->tdb, "url") != NULL) dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"url\": \"%s\",", trackDbSetting(track->tdb, "url")); // Close with some standard vars dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"shortLabel\": \"%s\",\n\t\t\"longLabel\": \"%s\",\n\t\t\"canPack\": %d,\n\t\t\"visibility\": %d\n\t}", javaScriptLiteralEncode(track->shortLabel), javaScriptLiteralEncode(track->longLabel), track->canPack, track->limitedVis); } @@ -1775,35 +1775,31 @@ hPrintf(" class='tableWithDragAndDrop'"); hPrintf(" style='border:1px solid blue;border-collapse:separate;'>\n"); #if defined(CONTEXT_MENU) || defined(TRACK_SEARCH) struct dyString *jsonTdbVars = NULL; #endif/// defined(CONTEXT_MENU) || defined(TRACK_SEARCH) char *newLine = NEWLINE_TO_USE(cgiClientBrowser(NULL,NULL,NULL)); struct imgTrack *imgTrack = imgBox->imgTracks; for(;imgTrack!=NULL;imgTrack=imgTrack->next) { char *trackName = (imgTrack->name != NULL ? imgTrack->name : imgTrack->tdb->track ); #if defined(CONTEXT_MENU) || defined(TRACK_SEARCH) struct track *track = hashFindVal(trackHash, trackName); if(track) - { - struct imgSlice *slice = imgTrackSliceGetByType(imgTrack,stButton); - boolean configurable = (slice->link != NULL || sliceGetMap(slice,FALSE) != NULL); // sliceMap is overkill since stButton has no image - jsonTdbSettingsBuild(&jsonTdbVars, track, configurable); - } + jsonTdbSettingsBuild(&jsonTdbVars, track, TRUE); #endif hPrintf("