70ef68d210fa4b76c16f7b8e8142a8180f75052a tdreszer Fri Jun 17 20:14:06 2011 -0700 Big checkin of jquery 1.5.1, jquery-ui 1.8 and ui-dropdownchecklist 1.3. Needs more testing and CSS work. DDCL is working on FF, Chrome and IE. Both Chrome and IE support required tiny changes to the DDCL wigit code. DDCL may still have problems with IE. Other jquery wigits have been tested at a cursory level and work fine. Ajax calls may need an extrat dataType: html param. Dialog (popup) needs CSS tuning. diff --git src/hg/js/hgTracks.js src/hg/js/hgTracks.js index 8b48cdd..f3043d8 100644 --- src/hg/js/hgTracks.js +++ src/hg/js/hgTracks.js @@ -14,31 +14,30 @@ var imgBoxPortal = false; var blockUseMap = false; var mapItems; var trackImg; // jQuery element for the track image var trackImgTbl; // jQuery element used for image table under imageV2 var imgAreaSelect; // jQuery element used for imgAreaSelect var originalImgTitle; var autoHideSetting = true; // Current state of imgAreaSelect autoHide setting var selectedMenuItem; // currently choosen context menu item (via context menu). var browser; // browser ("msie", "safari" etc.) var mapIsUpdateable = true; var currentMapItem; var floatingMenuItem; var visibilityStrsOrder = new Array("hide", "dense", "full", "pack", "squish"); // map browser numeric visibility codes to strings var supportZoomCodon = false; -var newJQuery = false; // temporary #define for use while testing jQuery 1.5/jQuery UI 1.8 in dev trees function initVars(img) { // There are various entry points, so we call initVars in several places to make sure this variables get updated. if(!originalPosition) { // remember initial position and size so we can restore it if user cancels originalPosition = getOriginalPosition(); originalSize = $('#size').text(); originalCursor = jQuery('body').css('cursor'); } } function selectStart(img, selection) { initVars(); @@ -1244,33 +1243,30 @@ var thisForm=$(obj).parents('form'); if(thisForm == undefined || $(thisForm).length == 0) thisForm=$("FORM"); if($(thisForm).length > 1 ) thisForm=$(thisForm)[0]; if(thisForm != undefined && $(thisForm).length == 1) { //alert("posting form:"+$(thisForm).attr('name')); return postTheForm($(thisForm).attr('name'),obj.href); } return true; } $(document).ready(function() { var db = getDb(); - if(document.getElementById("hgt.newJQuery") != null) { - newJQuery = true; - } if(jQuery.fn.autocomplete && $('input#suggest') && db) { if(newJQuery) { $('input#suggest').autocomplete({ delay: 500, minLength: 2, source: ajaxGet(function () {return db;}, new Object, true), select: function (event, ui) { setPosition(ui.item.id, commify(getSizeFromCoordinates(ui.item.id))); makeSureSuggestTrackIsVisible(); // jQuery('body').css('cursor', 'wait'); // document.TrackHeaderForm.submit(); } }); } else { @@ -1875,31 +1871,31 @@ } function makeContextMenuHitCallback(title) { // stub to avoid problem with a function closure w/n a loop return function(menuItemClicked, menuObject) { contextMenuHit(menuItemClicked, menuObject, title); return true; }; } function makeImgTag(img) { // Return img tag with explicit dimensions for img (dimensions are currently hardwired). // This fixes the "weird shadow problem when first loading the right-click menu" seen in FireFox 3.X, // which occurred b/c FF doesn't actually fetch the image until the menu is being shown. - return "<img width='16px' height='16px' src='../images/" + img + "' />"; + return "<img style='width:16px; height:16px; border-style:none;' src='../images/" + img + "' />"; } function loadContextMenu(img) { var menu = img.contextMenu( function() { popUpBoxCleanup(); // Popup box is not getting closed properly so must do it here var menu = []; var selectedImg = makeImgTag("greenChecksm.png"); var blankImg = makeImgTag("invisible16.png"); var done = false; if(selectedMenuItem && selectedMenuItem.id != null) { var href = selectedMenuItem.href; var isHgc, isGene; @@ -1926,38 +1922,40 @@ offerSingles = false; if(subSet.length < compositeSet.length) { offerHideSubset = true; $( subSet ).addClass("greenRows"); // green persists } } } } } // First option is hide sets if (offerHideComposite) { if (offerHideSubset) { var o = new Object(); o[blankImg + " hide track subset (green)"] = {onclick: makeContextMenuHitCallback('hideSet')}; + //o[makeImgTag("highliteGreenX.png") + " hide track subset"] = {onclick: makeContextMenuHitCallback('hideSet')}; menu.push(o); } var o = new Object(); var str = blankImg + " hide track set"; if (offerHideSubset) str += " (blue)"; o[str] = {onclick: makeContextMenuHitCallback('hideComposite')}; + //o[makeImgTag("btnBlueX.png") + " hide track set"] = {onclick: makeContextMenuHitCallback('hideComposite')}; menu.push(o); } // Second set of options: visibility for single track if (offerSingles) { if (offerHideComposite) menu.push($.contextMenu.separator); // XXXX what if select is not available (b/c trackControlsOnMain is off)? // Move functionality to a hidden variable? var select = $("select[name=" + id + "]"); if (select.length > 1) // Not really needed if $('#hgTrackUiDialog').html(""); has worked select = [ $(select)[0] ]; var cur = $(select).val(); if(cur) { @@ -2311,57 +2309,75 @@ $.getScript(file); // Should protect against already loaded files. }); */ /* //in open ? Loads fine, but then dialog gets confused $(jsFiles).each(function (i) { bix = "<script type='text/javascript' SRC='".length; eix = this.lastIndexOf("'></script>"); file = this.substring(bix,eix); //$.getScript(file,function(data) { warn(data.substring(0,20) + " loaded")}); });*/ if( ! popUpTrackDescriptionOnly ) { var subtrack = tdbIsSubtrack(trackDbJson[popUpTrackName]) ? popUpTrackName :""; // If subtrack then vis rules differ popSaveAllVars = getAllVars( $('#hgTrackUiDialog'), subtrack ); // Saves the vars that may get changed by the popup cfg. // -- popup.ready() -- Here is the place to do things that might otherwise go into a $('#pop').ready() routine! + if (!newJQuery) { $('#hgTrackUiDialog').find('.filterComp').each( function(i) { // Do this by 'each' to set noneIsAll individually - $(this).dropdownchecklist({ firstItemChecksAll: true, noneIsAll: $(this).hasClass('filterBy'), maxDropHeight: filterByMaxHeight(this) }); + $(this).dropdownchecklist({ firstItemChecksAll: true, + noneIsAll: $(this).hasClass('filterBy'), + maxDropHeight: filterByMaxHeight(this), + emptyText: "Please select ...", + textFormatFunction: ddclTextFormatter }); }); } + } $('#hgTrackUiDialog').dialog({ ajaxOptions: { // This doesn't work cache: true }, resizable: popUpTrackDescriptionOnly, height: 'auto', width: 'auto', minHeight: 200, minWidth: 700, modal: true, closeOnEscape: true, autoOpen: false, buttons: { "OK": function() { if( ! popUpTrackDescriptionOnly ) hgTrackUiPopCfgOk($('#pop'), popUpTrackName); $(this).dialog("close"); }}, // popup.ready() doesn't seem to work in open. So there is no need for open at this time. //open: function() { // var subtrack = tdbIsSubtrack(trackDbJson[popUpTrackName]) ? popUpTrackName :""; // If subtrack then vis rules differ // popSaveAllVars = getAllVars( $('#pop'), subtrack ); //}, + open: function () { + if (newJQuery) { + if( ! popUpTrackDescriptionOnly ) { + $('#hgTrackUiDialog').find('.filterComp').each( function(i) { + if ($(this).hasClass('filterBy')) + ddclSetup(this, 'noneIsAll'); + else + ddclSetup(this); + }); + } + } + }, close: function() { popUpBoxCleanup(); } }); // FIXME: Why are open and close no longer working!!! if(popUpTrackDescriptionOnly) { var myWidth = $(window).width() - 300; if(myWidth > 900) myWidth = 900; $('#hgTrackUiDialog').dialog("option", "maxWidth", myWidth); $('#hgTrackUiDialog').dialog("option", "width", myWidth); $('#hgTrackUiDialog').dialog('option' , 'title' , trackDbJson[popUpTrackName].shortLabel + " Track Description"); $('#hgTrackUiDialog').dialog('open'); var buttOk = $('button.ui-state-default'); if($(buttOk).length == 1)