1a0fe31189d4bbaeccc42b8f34fe12e876e189d7 galt Fri Feb 3 10:09:59 2017 -0800 removing debugging and old CSP1 stuff. diff --git src/hg/js/hgTracks.js src/hg/js/hgTracks.js index 9c71faa..1290433 100644 --- src/hg/js/hgTracks.js +++ src/hg/js/hgTracks.js @@ -479,54 +479,30 @@ { // code to update page when user changes assembly select list. $.ajax({ type: "GET", url: "../cgi-bin/hgApi", data: cart.varsToUrlData({ 'cmd': 'defaultPos', 'db': getDb() }), dataType: "html", trueSuccess: genomePos.handleChange, success: catchErrorOrDispatch, error: errorHandler, cache: true }); return false; }, - inlineJs : "", - - getInlineJs: function (response, status) - { - //alert("genomePos.getInlineJs called!"); // DEBUG REMOVE - genomePos.inlineJs = response; - }, - - fetchInlineJs: function (url) - { // code to fetch temp file with inline js in it. // OBSOLETE CSP1 - $.ajax({ - type: "GET", - async: false, // wait for result - url: url, - dataType: "html", - trueSuccess: genomePos.getInlineJs, - success: catchErrorOrDispatch, - error: errorHandler, - cache: false - }); - return genomePos.inlineJs; - }, - - convertedVirtCoords : {chromStart : -1, chromEnd : -1}, handleConvertChromPosToVirtCoords: function (response, status) { var virtStart = -1, virtEnd = -1; var newJson = scrapeVariable(response, "convertChromToVirtChrom"); if (!newJson) { warn("convertChromToVirtChrom object is missing from the response"); } else { virtStart = newJson.virtWinStart; virtEnd = newJson.virtWinEnd; } genomePos.convertedVirtCoords = {chromStart : virtStart, chromEnd : virtEnd}; }, @@ -3489,57 +3465,52 @@ if (imageV2.mapIsUpdateable) { imageV2.requestImgUpdate(trackName,urlData,""); } else { window.location = "../cgi-bin/hgTracks?" + urlData + "&hgsid=" + getHgsid(); } } } } }, uiDialog: function (response, status) { // Take html from hgTrackUi and put it up as a modal dialog. var pageNonce = getNonce(); - alert('pageNonce='+pageNonce); // DEBUG REMOVE var ajaxNonce = stripNonce(response, false); - alert('ajaxNonce='+ajaxNonce); // DEBUG REMOVE var jsNonce = stripJsNonce(response, ajaxNonce, false);// DEBUG msg with true // make sure all links (e.g. help links) open up in a new window response = response.replace(/"+ cleanHtml +""); // append ajax js blocks with nonce var i; for (i=0; i"+js+""); - newJson = scrapeVariable(response, "hgTracks"); - } - } - //alert(JSON.stringify(newJson)); // DEBUG Example var oldJson = hgTracks; var valid = false; if (!newJson) { var stripped = {}; stripJsEmbedded(response, true, stripped); if ( ! stripped.warnMsg ) warn("hgTracks object is missing from the response"); } else { if (this.id) { if (newJson.trackDb[this.id]) { var visibility = vis.enumOrder[newJson.trackDb[this.id].visibility]; var limitedVis; if (newJson.trackDb[this.id].limitedVis)