2b30b55d6a5b71648296873b570b9d68b4901b6a galt Wed Feb 15 02:21:56 2017 -0800 CSP code cleanup. Using jsInlineF where needed for compact and efficient code, not using fixed-size local javascript strings which could overflow. diff --git src/hg/hgTables/mainPage.c src/hg/hgTables/mainPage.c index 77573c1..529165d 100644 --- src/hg/hgTables/mainPage.c +++ src/hg/hgTables/mainPage.c @@ -932,59 +932,55 @@ "MySQL server. " "To examine the biological function of your set through annotation " "enrichments, send the data to " "GREAT. " "%s" "Refer to the " "Credits page for the list of " "contributors and usage restrictions associated with these data. " "All tables can be downloaded in their entirety from the " "Sequence and Annotation Downloads page." , getGenomeSpaceText() ); // When GREAT is selected, disable the other checkboxes and force output to BED -struct dyString *js = dyStringNew(1024); -dyStringPrintf(js, +jsInline( "function onSelectGreat() {\n" " document.getElementById('checkboxGalaxy').checked=false;\n"); if (isGenomeSpaceEnabled()) - dyStringPrintf(js, + jsInline( " document.getElementById('checkboxGenomeSpace').checked=false;\n"); -dyStringPrintf(js, +jsInline( " document.getElementById('outBed').selected=true;\n" " return true;\n" "}\n"); -jsInline(js->string); // Disable/enable noGenome tracks depending on whether region is genome. -dyStringClear(js); -dyStringPrintf(js, +jsInline( "function maybeDisableNoGenome() {\n" " var regionTypeSelected = $('input[name=\"hgta_regionType\"]:checked').val();\n" " var regionIsGenome = (regionTypeSelected === 'genome');\n" " var $noGenomeOptions = $('select[name=\"hgta_track\"] option.hgtaNoGenome');\n" " $noGenomeOptions.attr('disabled', regionIsGenome)\n" " .css('color', regionIsGenome ? '' : 'black');\n" "}\n" "$(document).ready(function() {\n" // once when the page loads, and every time the user changes the region type: " maybeDisableNoGenome();\n" " $('input[name=\"hgta_regionType\"]').change(maybeDisableNoGenome);\n" "});\n"); -jsInline(js->string); /* Main form. */ hPrintf("
\n", getScriptName(), cartUsualString(cart, "formMethod", "POST")); cartSaveSession(cart); jsInit(); showMainControlTable(conn); hPrintf("
\n"); /* Hidden form - for benefit of javascript. */ { static char *saveVars[] = { "clade", "org", "db", hgtaGroup, hgtaTrack, hgtaTable, hgtaRegionType, hgtaRange, hgtaOutputType, hgtaOutFileName}; jsCreateHiddenForm(cart, getScriptName(), saveVars, ArraySize(saveVars));