f20643ce0ffbd806e8e1b7baac473372f93d0edf tdreszer Fri Feb 11 09:47:49 2011 -0800 Fixed bug screwing up track search tab switching. It seems that ui.code.js does not play well with the tabs widget. diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 34a4df2..90f1e13 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -5586,37 +5586,40 @@ { jsIncludeFile("jquery.imgareaselect.js", NULL); jsIncludeFile("ajax.js", NULL); webIncludeResourceFile("autocomplete.css"); jsIncludeFile("jquery.autocomplete.js", NULL); jsIncludeFile("autocomplete.js", NULL); } jsIncludeFile("hgTracks.js", NULL); #ifdef LOWELAB jsIncludeFile("lowetooltip.js", NULL); #endif if(advancedJavascriptFeaturesEnabled(cart)) { -webIncludeResourceFile("jquery.contextmenu.css"); -webIncludeResourceFile("ui.dropdownchecklist.css"); webIncludeResourceFile("jquery-ui.css"); + if (sameString(cartUsualString(cart, TRACK_SEARCH,"0"),"0")) // NOT doing search + { + webIncludeResourceFile("jquery.contextmenu.css"); jsIncludeFile("jquery.contextmenu.js", NULL); + webIncludeResourceFile("ui.dropdownchecklist.css"); jsIncludeFile("ui.core.js", NULL); jsIncludeFile("ui.dropdownchecklist.js", NULL); } + } jsIncludeFile("jquery-ui.js", NULL); //if (!trackImgOnly) { hPrintf("<div id='hgTrackUiDialog' style='display: none'></div>\n"); // XXXX stole this and '.hidden' from bioInt.css - needs work hPrintf("<div id='warning' class='ui-state-error ui-corner-all hidden' style='font-size: 0.75em; display: none;' onclick='$(this).hide();'><p><span class='ui-icon ui-icon-alert' style='float: left; margin-right: 0.3em;'></span><strong></strong><span id='warningText'></span> (click to hide)</p></div>\n"); } if (cartVarExists(cart, "chromInfoPage")) { cartRemove(cart, "chromInfoPage"); chromInfoPage(); } else if (differentString(cartUsualString(cart, TRACK_SEARCH,"0"),"0")) {