409d9d0724395f0d6089d39c80967e24091d25cf
Merge parents 8155914 9bb0b80
tdreszer
  Tue Jul 26 09:22:50 2011 -0700
Merge branch 'master' into tdreszer-subCfg
diff --cc src/hg/js/ddcl.js
index 640743bc,a90b0fd..e7cbef8
--- src/hg/js/ddcl.js
+++ src/hg/js/ddcl.js
@@@ -166,41 -166,41 +166,41 @@@
  
          $(filterBys).each( function(i) { // Do this by 'each' to set noneIsAll individually
              var multiSelect = this;
              if (!force) { // condition on bad dimensions
                  var id = $(multiSelect).attr('id');
                  control = $('#ddcl-' + id);
                  if (control != null && control != undefined) {
                      var controlSelector = $(control).find(".ui-dropdownchecklist-selector");
                      if ($(controlSelector).width() > 20)
                          return;  // Dimensions look okay
                  }
              }
              $(multiSelect).dropdownchecklist("destroy");
              $(multiSelect).show(); // necessary to get dimensions
              if (newJQuery)
-                 ddclSetup(multiSelect,'noneIsAll');
+                 ddcl.setup(multiSelect,'noneIsAll');
              else
                  $(multiSelect).dropdownchecklist({ firstItemChecksAll: true,
                                                     noneIsAll: true,
                                                     maxDropHeight: filterByMaxHeight(multiSelect) });
          });
      },
  
      setup: function (obj) {
          // Initialize the multiselect as a DDCL (drop-down checkbox-list)
 -        mySelf = this;
 +        //mySelf = this; // There is no need for a "mySelf" unless this object is being instantiated.
  
          // Defaults
          var myFirstIsAll = true;
          var myNoneIsAll  = false;
          var myIcon       = null;
          var myEmptyText  = 'Select...';
          var myClose      = 'close  ';
          var myDropHeight = filterByMaxHeight(obj);
          // parse optional args
          for(var vIx=1;vIx<arguments.length;vIx++) {
              switch(arguments[vIx]) {
                  case 'noneIsAll':   myNoneIsAll = true;
                                      break;
                  case 'firstNotAll': myFirstIsAll = false;
                                      break;