bede17ee6e4dc7e74c07e76c666bb8b3439e65e6 galt Mon Mar 6 16:31:28 2017 -0800 fixes #19018. hub disconnect buttons had duplicate ids. The id now incorporates the group name to make it unique. diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 60129a5..2552b54 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -8075,47 +8075,48 @@ char *indicatorImg; boolean isOpen = !isCollapsedGroup(group); collapseGroupGoodies(isOpen, TRUE, &indicatorImg, &indicator, &otherState); hPrintf("<TR>"); cg->rowOpen = TRUE; if (!hIsGsidServer()) hPrintf("<th align=\"left\" colspan=%d class='blueToggleBar'>",MAX_CONTROL_COLUMNS); else hPrintf("<th align=\"left\" colspan=%d class='blueToggleBar'>", MAX_CONTROL_COLUMNS-1); hPrintf("<table style='width:100%%;'><tr><td style='text-align:left;'>"); hPrintf("\n<A NAME=\"%sGroup\"></A>",group->name); - hPrintf("<IMG class='toggleButton'" - " id=\"%s_button\" src=\"%s\" alt=\"%s\" title='%s this group'> ", - group->name, indicatorImg, indicator,isOpen?"Collapse":"Expand"); char idText[256]; safef(idText, sizeof idText, "%s_button", group->name); + hPrintf("<IMG class='toggleButton'" + " id='%s' src=\"%s\" alt=\"%s\" title='%s this group'> ", + idText, indicatorImg, indicator,isOpen?"Collapse":"Expand"); jsOnEventByIdF("click", idText, "return vis.toggleForGroup(this, '%s');", group->name); hPrintf("</td><td style='text-align:center; width:90%%;'>\n<B>%s</B>", group->label); hPrintf("</td><td style='text-align:right;'>\n"); if (isHubTrack(group->name)) { - hPrintf("<input name=\"hubDisconnectButton\" id='hub_disconn'" - "type=\"button\" value=\"disconnect\">\n"); - jsOnEventByIdF("click", "hub_disconn", + safef(idText, sizeof idText, "%s_disconn", group->name); + hPrintf("<input name=\"hubDisconnectButton\" id='%s'" + " type=\"button\" value=\"disconnect\">\n", idText); + jsOnEventByIdF("click", idText, "document.disconnectHubForm.elements['hubId'].value='%s';" "document.disconnectHubForm.submit();return true;", - &group->name[sizeof hubTrackPrefix - 1]); + group->name + strlen(hubTrackPrefix)); } hPrintf("<input type='submit' name='hgt.refresh' value='refresh' " "title='Update image with your changes'>\n"); hPrintf("</td></tr></table></th>\n"); controlGridEndRow(cg); /* Base Position track goes into map group, which will always exist. */ if (!showedRuler && sameString(group->name, "map") ) { char *url = trackUrl(RULER_TRACK_NAME, chromName); showedRuler = TRUE; myControlGridStartCell(cg, isOpen, group->name); hPrintf("<A HREF=\"%s\">", url); hPrintf(" %s<BR> ", RULER_TRACK_LABEL);