17a8db6b7018e5a72308700aa344ec94548077e5 tdreszer Thu Jan 26 11:29:43 2012 -0800 Shlurping up warn messages in ajax results needed extending to multiple messages. diff --git src/hg/js/utils.js src/hg/js/utils.js index 0e946f4..06fc959 100644 --- src/hg/js/utils.js +++ src/hg/js/utils.js @@ -1146,37 +1146,39 @@ // embedded javascript? while(cleanHtml.length > 0) { var ix = cleanHtml.search(/\<script type=\'text\/javascript\'\>/i); if (ix == -1) break; var ix2 = cleanHtml.search(/\<\/script\>/i); if (ix2 == -1) break; var jsEmbeded = cleanHtml.slice(ix,ix2+"</script>".length); if (jsEmbeded && jsEmbeded.length > 0) { // ignore warnBoxes if(-1 == jsEmbeded.indexOf("showWarnBox")) { if (showError) alert("jsEmbedded:'"+jsEmbeded+"'\n---------------\n"+cleanHtml); } else { - var ix3 = cleanHtml.indexOf('<P>',ix); + var ix3 = ix; + while ((ix3 = cleanHtml.indexOf('<P>',ix3)) != -1) { var ix4 = cleanHtml.indexOf('</P>',ix); var warnMsg = cleanHtml.slice(ix3+3,ix4-1); cleanHtml = cleanHtml.slice(0,ix3) + cleanHtml.slice(ix4+4); warn(warnMsg); } } + } cleanHtml = cleanHtml.slice(0,ix) + cleanHtml.slice(ix2+"</script>".length); } return cleanHtml; } function visTriggersHiddenSelect(obj) { // SuperTrack child changing vis should trigger superTrack reshaping. // This is done by setting hidden input "_sel" var trackName_Sel = $(obj).attr('name') + "_sel"; var theForm = $(obj).closest("form"); var visible = (obj.selectedIndex != 0); if (visible) { updateOrMakeNamedVariable(theForm,trackName_Sel,"1"); } else disableNamedVariable(theForm,trackName_Sel);