cc109c4e7b14db8811a02d155864770826812582 tdreszer Fri Dec 9 09:04:52 2011 -0800 Fixed subtrack sort loosing user setting in drop downs and fixed IE9 subVisDD being unclickable. diff --git src/hg/lib/hui.c src/hg/lib/hui.c index d77e044..f314d3b 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -3828,30 +3828,38 @@ struct slRef *subtrackRef, *subtrackRefList = trackDbListGetRefsToDescendantLeaves(parentTdb->subtracks); // Look for dividers, heirarchy, dimensions, sort and dragAndDrop! char **lastDivide = NULL; dividers_t *dividers = dividersSettingGet(parentTdb); if (dividers) lastDivide = needMem(sizeof(char*)*dividers->count); hierarchy_t *hierarchy = hierarchySettingGet(parentTdb); membersForAll_t* membersForAll = membersForAllSubGroupsGet(parentTdb,NULL); int dimCount=0,di; for(di=0;didimMax;di++) { if (membersForAll->members[di]) dimCount++; } sortOrder_t* sortOrder = sortOrderGet(cart,parentTdb); boolean preSorted = FALSE; boolean useDragAndDrop = sameOk("subTracks",trackDbSetting(parentTdb, "dragAndDrop")); +#ifdef SUBTRACK_CFG +if (useDragAndDrop) // IE9 fails on subVisDD when dragAndDrop ! + { + char *browserVersion; + if (btIE == cgiClientBrowser(&browserVersion, NULL, NULL) && *browserVersion > '8') + useDragAndDrop = FALSE; + } +#endif///def SUBTRACK_CFG char buffer[SMALLBUF]; char *displaySubs = NULL; int subCount = slCount(subtrackRefList); #define LARGE_COMPOSITE_CUTOFF 30 if (subCount > LARGE_COMPOSITE_CUTOFF) { safef(buffer,SMALLBUF,"%s.displaySubtracks",parentTdb->track); displaySubs = cartUsualString(cart, buffer,"some"); // track specific defaults to only selected } else { displaySubs = cartUsualString(cart, "displaySubtracks", "all"); // browser wide defaults to all } boolean displayAll = sameString(displaySubs, "all");