af730d9e24c0642fe39657f890bc117ed015ccbf galt Wed Feb 15 01:12:26 2017 -0800 CSP code cleanup. Using new var-args versions of functions jsInlineF and jsOnEventByIdF to avoid using lots of fixed-size local javascript strings. diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 10b136f..08cc452 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -8078,47 +8078,44 @@ &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 jsText[256]; - safef(jsText, sizeof jsText, "return vis.toggleForGroup(this, '%s');", group->name); char idText[256]; safef(idText, sizeof idText, "%s_button", group->name); - jsOnEventById("click", idText, jsText); + 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"); - safef(jsText, sizeof jsText, + jsOnEventByIdF("click", "hub_disconn", "document.disconnectHubForm.elements['hubId'].value='%s';" "document.disconnectHubForm.submit();return true;", &group->name[sizeof hubTrackPrefix - 1]); - jsOnEventById("click", "hub_disconn", jsText); } 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);