9a24eab7aa53e82ca200d92f532411f37d8487f3 braney Sat Feb 24 18:09:09 2018 -0800 add lazy loading to hgCollection, modify CSP policy to allow blob: diff --git src/hg/js/hgTracks.js src/hg/js/hgTracks.js index 524e911..ef9b131 100644 --- src/hg/js/hgTracks.js +++ src/hg/js/hgTracks.js @@ -2698,31 +2698,31 @@ 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: false, + async: true, 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; @@ -3578,30 +3578,33 @@ // and add text that indicates the shortcuts to many static menubar items as suggested by good old IBM CUA/SAA function addKeyboardHelpEntries() { var html = '<li><a id="keybShorts" title="List all possible keyboard shortcuts" href="#">Keyboard Shortcuts</a><span class="shortcut">?</span></li>'; $('#help .last').before(html); $("#keybShorts").click( function(){showHotkeyHelp();} ); html = '<span class="shortcut">s s</span>'; $('#sessionsMenuLink').after(html); html = '<span class="shortcut">p s</span>'; $('#publicSessionsMenuLink').after(html); html = '<span class="shortcut">c t</span>'; $('#customTracksMenuLink').after(html); + html = '<span class="shortcut">t c</span>'; + $('#customCompositeMenuLink').after(html); + html = '<span class="shortcut">t h</span>'; $('#trackHubsMenuLink').after(html); html = '<span class="shortcut">t b</span>'; $('#blatMenuLink').after(html); html = '<span class="shortcut">t t</span>'; $('#tableBrowserMenuLink').after(html); html = '<span class="shortcut">t i</span>'; $('#ispMenuLink').after(html); html = '<span class="shortcut">t s</span>'; $('#trackSearchMenuLink').after(html);