a22c4cbf9b1069eab66b2fce2a20dee7cb2e69c5 larrym Wed Jan 5 17:05:13 2011 -0800 make sure the link contains chrom info for cmd == followLink; fixes redmine 1333#note-56 diff --git src/hg/js/hgTracks.js src/hg/js/hgTracks.js index 07cc49d..9bb0e7e 100644 --- src/hg/js/hgTracks.js +++ src/hg/js/hgTracks.js @@ -1618,44 +1618,47 @@ // Fetch a new copy of track img and show it to the user in another window. This code assume we have updated // remote cart with all relevant chages (e.g. drag-reorder). var data = "hgt.imageV1=1&hgt.trackImgOnly=1&hgsid=" + getHgsid(); jQuery('body').css('cursor', 'wait'); $.ajax({ type: "GET", url: "../cgi-bin/hgTracks", data: data, dataType: "html", trueSuccess: handleViewImg, success: catchErrorOrDispatch, error: errorHandler, cmd: cmd, cache: false }); - } else if (cmd == 'openLink') { - // Remove hgsid to force a new session (see redmine ticket 1333). - var href = removeHgsid(selectedMenuItem.href); + } else if (cmd == 'openLink' || cmd == 'followLink') { + var href = selectedMenuItem.href; var chrom = $("input[name=chromName]").val(); if(chrom && href.indexOf("c=" + chrom) == -1) { // make sure the link contains chrom info (necessary b/c we are stripping hgsid) href = href + "&c=" + chrom; } + if(cmd == 'followLink') { + // XXXX This is blocked by Safari's popup blocker (without any warning message). + location.assign(href); + } else { + // Remove hgsid to force a new session (see redmine ticket 1333). + href = removeHgsid(href); if(window.open(href) == null) { windowOpenFailedMsg(); } - } else if (cmd == 'followLink') { - // XXXX This is blocked by Safari's popup blocker (without any warning message). - location.assign(selectedMenuItem.href); + } } else { // if( cmd in 'hide','dense','squish','pack','full','show' ) // Change visibility settings: // // First change the select on our form: var id = selectedMenuItem.id; var rec = trackDbJson[id]; var selectUpdated = updateVisibility(id, cmd); // Now change the track image if(imageV2 && cmd == 'hide') { // Hide local display of this track and update server side cart. // Subtracks controlled by 2 settings so del vis and set sel=0. Others, just set vis hide. if(rec.parentTrack != undefined) setCartVars( [ id, id+"_sel" ], [ 'hide', 0 ] ); // Don't set '_sel" to [] because default gets used, but we are explicitly hiding this!