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(""); cg->rowOpen = TRUE; if (!hIsGsidServer()) hPrintf("",MAX_CONTROL_COLUMNS); else hPrintf("", MAX_CONTROL_COLUMNS-1); hPrintf("
"); hPrintf("\n",group->name); hPrintf("\"%s\"  ", 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("\n%s", group->label); hPrintf("\n"); if (isHubTrack(group->name)) { hPrintf("\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("\n"); hPrintf("
\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("", url); hPrintf(" %s
", RULER_TRACK_LABEL);