f01fbeba761e2b110036a9a71c05b373895ced97 braney Mon Feb 26 13:35:01 2018 -0800 make sure collection tree is loaded before removing wait screen. Make hgTracks ajax requests synchronous to remove race condition diff --git src/hg/js/hgTracks.js src/hg/js/hgTracks.js index ef9b131..a3b04d3 100644 --- src/hg/js/hgTracks.js +++ src/hg/js/hgTracks.js @@ -2698,53 +2698,53 @@ if (tdbHasParent(rec) && tdbIsLeaf(rec)) url += rec.parentTrack; else { // The button already has the ref var link = normed($( 'td#td_btn_'+ rightClick.selectedMenuItem.id ).children('a')); if (link) url = $(link).attr('href'); else url += rightClick.selectedMenuItem.id; } location.assign(url); } else if (cmd === 'newCollection') { $.ajax({ type: "PUT", - async: true, + async: false, url: "../cgi-bin/hgCollection", data: "cmd=newCollection&track=" + id + "&hgsid=" + getHgsid(), trueSuccess: mySuccess, success: catchErrorOrDispatch, error: errorHandler, }); imageV2.fullReload(); } else if (cmd === 'addCollection') { var shortLabel = $(menuItemClicked).text().substring(9).slice(0,-1); var ii; var collectionName; for(ii=0; ii < hgTracks.collections.length; ii++) { if ( hgTracks.collections[ii].shortLabel === shortLabel) { collectionName = hgTracks.collections[ii].track; break; } } $.ajax({ type: "PUT", - async: true, + async: false, url: "../cgi-bin/hgCollection", data: "cmd=addTrack&track=" + id + "&collection=" + collectionName + "&hgsid=" + getHgsid(), trueSuccess: mySuccess, success: catchErrorOrDispatch, error: errorHandler, }); imageV2.fullReload(); } else if ((cmd === 'sortExp') || (cmd === 'sortSim')) { url = "hgTracks?hgsid=" + getHgsid() + "&" + cmd + "="; rec = hgTracks.trackDb[id]; if (tdbHasParent(rec) && tdbIsLeaf(rec)) url += rec.parentTrack; else { // The button already has the ref