fe53cd1dcb44177021c45da263559a15fcda9280 tdreszer Mon Sep 27 13:08:22 2010 -0700 Make composite vis go to full if hidden and matrix or subtrack cb is checked diff --git src/hg/js/hui.js src/hg/js/hui.js index c07ef40..45b7408 100644 --- src/hg/js/hui.js +++ src/hg/js/hui.js @@ -31,7 +31,7 @@ } else { // Make main display dropdown show full if currently hide compositeName = obj.name.substring(0,obj.name.indexOf(".")); // {trackName}.{view}.vis - exposeComposite(compositeName); + exposeAll(); matSubCBsEnable(true,view); // Needed for later @@ -94,14 +94,12 @@ waitOnFunction( _matSelectViewForSubTracks, obj,view); } -function exposeComposite(compositeName) +function exposeAll() { // Make main display dropdown show full if currently hide - var compositeDD = $("select[name='"+compositeName+"']"); - if($(compositeDD).attr('selectedIndex') < 1) { // Composite vis display is HIDE - var maxVis = ($(compositeDD).children('option').length - 1); - $(compositeDD).attr('selectedIndex',maxVis); - } + var visDD = $("select.visDD"); // limit to hidden + if ($(visDD).length == 1 && $(visDD).attr('selectedIndex') == 0) // limit to hidden + $(visDD).attr('selectedIndex',$(visDD).children('option').length - 1); } function matSubCbClick(subCB) @@ -122,6 +120,10 @@ //if( abcCB != undefined ) { // matChkBoxNormalize( abcCB, classes ); //} + + if(subCB.checked) + exposeAll(); // Unhide composite vis? + matSubCBsSelected(); } @@ -159,6 +161,9 @@ } } } + + if(matCB.checked) + exposeAll(); // Unhide composite vis? matSubCBsSelected(); }