src/hg/js/hui.js 1.30

Index: src/hg/js/hui.js
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/js/hui.js,v
retrieving revision 1.29
retrieving revision 1.30
diff -b -B -U 4 -r1.29 -r1.30
--- src/hg/js/hui.js	2 Jun 2009 19:12:17 -0000	1.29
+++ src/hg/js/hui.js	18 Aug 2009 23:22:51 -0000	1.30
@@ -3,8 +3,9 @@
 
 var debugLevel = 0;
 var viewDDtoSubCB = true;
 var viewDDtoSubCBhide = false;
+var compositeName = "";
 //var viewDDtoMatCB = true; //true;
 //var matCBwithViewDD = true;
 //var subCBtoMatCB = true;
 //var matCBtoSubCB = true; // Always
@@ -36,22 +37,10 @@
     } else {
         //enableViewCfgLink(true,view);   // Would need to reeanble view cfg when visible
 
         // Make main display dropdown show full if currently hide
-        var trackName = obj.name.substring(0,obj.name.indexOf(".")); // {trackName}.{view}.vis
-        var compositeDD = $("select[name='"+trackName+"']");
-        if($(compositeDD).attr('selectedIndex') < ($(compositeDD).children('option').length - 1)) { // Composite vis display not already full
-            var list = $(".viewDd");
-            var maxVis = obj.selectedIndex;
-            $(list).each(function (i) {
-                if( maxVis < this.selectedIndex)
-                    maxVis = this.selectedIndex;
-            });
-                 if($(compositeDD).children('option').length - 1 < maxVis)
-                    $(compositeDD).attr('selectedIndex') = $(compositeDD).options.length - 1;
-            else if($(compositeDD).attr('selectedIndex') < maxVis)
-                    $(compositeDD).attr('selectedIndex',maxVis);
-        }
+        compositeName = obj.name.substring(0,obj.name.indexOf(".")); // {trackName}.{view}.vis
+        exposeComposite(compositeName);
         // if matrix used then: essentially reclick all 'checked' matrix checkboxes
         if(viewDDtoSubCB) {
             var CBs = $("input.matrixCB").filter(":checked");
             if(CBs.length > 0) {
@@ -89,8 +78,18 @@
         matEnableSubtrackCheckBoxes(true,view);
     }
 }
 
+function exposeComposite(compositeName)
+{
+    // 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);
+    }
+}
+
 // Obsolete because matCBwithViewDD is not true
 //function getViewNamesSelected(on)
 //{
 //// Returns an array of all views that are on or off (hide)