635fff8240e4a39e1ac3c817a5be68116f02e389 larrym Thu Feb 17 15:49:21 2011 -0800 make sure l and r values are in open & show details... links (fixes redmine #2896) diff --git src/hg/js/hgTracks.js src/hg/js/hgTracks.js index 7a6879b..0dfa3f0 100644 --- src/hg/js/hgTracks.js +++ src/hg/js/hgTracks.js @@ -1616,40 +1616,45 @@ 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' || cmd == 'followLink') { var href = selectedMenuItem.href; + var vars = new Array("c", "l", "r"); + var hiddens = new Array("chromName", "l", "r"); + for (i in vars) { + // make sure the link contains chrom and window width info (necessary b/c we are stripping hgsid and/or the cart may be empty); + // but don't add chrom to wikiTrack links (see redmine #2476). + var val = $("input[name=" + hiddens[i] + "]").val(); + var v = vars[i]; + if(val && id != "wikiTrack" && (href.indexOf("?" + v + "=") == -1) && (href.indexOf("&" + v + "=") == -1)) { + href = href + "&" + v + "=" + val; + } + } if(cmd == 'followLink') { // XXXX This is blocked by Safari's popup blocker (without any warning message). location.assign(href); } else { - var chrom = $("input[name=chromName]").val(); - if(chrom && id != "wikiTrack" && href.indexOf("c=" + chrom) == -1) { - // make sure the link contains chrom info (necessary b/c we are stripping hgsid); but don't add chrom - // to wikiTrack links (see redmine #2476). - href = href + "&c=" + chrom; - } // Remove hgsid to force a new session (see redmine ticket 1333). href = removeHgsid(href); if(window.open(href) == null) { windowOpenFailedMsg(); } } } else if (cmd == 'float') { if(floatingMenuItem && floatingMenuItem == id) { $.floatMgr.FOArray = new Array(); floatingMenuItem = null; } else { if(floatingMenuItem) { // This doesn't work. $('#img_data_' + floatingMenuItem).parent().restartFloat(); // This does work