d6f13dc5b878f621bc0eee459f81ca48958f9122 larrym Wed Feb 22 13:50:03 2012 -0800 remove obsolete json.err code diff --git src/hg/js/hgTracks.js src/hg/js/hgTracks.js index 9cd353a..1ffb0c5 100644 --- src/hg/js/hgTracks.js +++ src/hg/js/hgTracks.js @@ -7,31 +7,30 @@ /* Data passed in from CGI via the hgTracks object: * * string cgiVersion // CGI_VERSION * string chromName // current chromosome * int winStart // genomic start coordinate (0-based, half-open) * int winEnd // genomic end coordinate * int newWinWidth // new width (in bps) if user clicks on the top ruler * boolean revCmplDisp // true if we are in reverse display * int insideX // width of side-bar (in pixels) * int rulerClickHeight // height of ruler (in pixels) - zero if ruler is hidden * boolean inPlaceUpdate // true if in-place-update is turned on * int imgBox* // various drag-scroll values * boolean measureTiming // true if measureTiming is on * Object trackDb // hash of trackDb entries for tracks which are visible on current page - * string err // error message (present only when hgTracks has hit a fatal berror). */ function initVars() { // There are various entry points, so we call initVars in several places to make sure all is well if (!genomePos.original) { // remember initial position and size so we can restore it if user cancels genomePos.original = genomePos.getOriginalPos(); genomePos.originalSize = $('#size').text(); dragSelect.originalCursor = jQuery('body').css('cursor'); imageV2.imgTbl = $('#imgTbl'); // imageV2.enabled == true unless: advancedJavascript==false, or trackSearch, or config pg imageV2.enabled = (imageV2.imgTbl != undefined && imageV2.imgTbl.length > 0); jQuery.each(jQuery.browser, function(i, val) { if(val) { @@ -2614,32 +2613,30 @@ updateImgAndMap: function (response, status) { // Handle ajax response with an updated trackMap image, map and optional ideogram. // // this.cmd can be used to figure out which menu item triggered this. // this.id == appropriate track if we are retrieving just a single track. // update local hgTracks.trackDb to reflect possible side-effects of ajax request. var json = scrapeVariable(response, "hgTracks"); var oldTrackDb = hgTracks.trackDb; var valid = false; if(json == undefined) { var stripped = new Object(); stripJsEmbedded(response, true, stripped); if(stripped.warnMsg == null) showWarning("hgTracks object is missing from the response"); - } else if (json.err) { - showWarning("Request failed; error: " + json.err); } else { if(this.id != null) { if(json.trackDb[this.id]) { var visibility = vis.enumOrder[json.trackDb[this.id].visibility]; var limitedVis; if(json.trackDb[this.id].limitedVis) limitedVis = vis.enumOrder[json.trackDb[this.id].limitedVis]; if(this.newVisibility && limitedVis && this.newVisibility != limitedVis) // see redmine 1333#note-9 alert("There are too many items to display the track in " + this.newVisibility + " mode."); var rec = hgTracks.trackDb[this.id]; rec.limitedVis = json.trackDb[this.id].limitedVis; vis.update(this.id, visibility); valid = true;