9e03de9174b5073b17eb19d29a8acb97b3afdb45 Merge parents c3c7185 d4b114c tdreszer Thu Nov 3 10:01:35 2011 -0700 Merge branch 'master' into tdreszer-subCfg diff --cc src/hg/js/ddcl.js index e9f1ec1,3c0b3b0..723b9e2 --- src/hg/js/ddcl.js +++ src/hg/js/ddcl.js @@@ -68,36 -68,36 +68,36 @@@ var newHeight = msg.split('<BR>').length * 20; //$(control).css('height',newHeight + 'px'); $(controlSelector).css({height: newHeight + 'px', background: '#fff'}); $(controlLabel).attr('title',newTitle); $(controlLabel).css({height: newHeight + 'px'}); $(controlLabel).css('color',newTextColor ); // could be empty string, thus removing the color $(controlLabel).html(msg); }, onOpen: function (event) { // Called by a DDCL onClick event (when the drop list is opened) var controlSelector = this; // Set the label var control = $(controlSelector).parent(); - mySelf.labelSet(control,"Select multiple...",'#000088','Selecting...'); + ddcl.labelSet(control,"Select multiple...",'#000088','Selecting...'); // Find the active 'items' and original 'options' var id = $(control).attr('id').substring('ddcl-'.length); var dropWrapper = $('#ddcl-' + id + '-ddw');//.first(); - var multiSelect = $('#' + id); + var multiSelect = $(document.getElementById(id)); var allCheckboxes = $(dropWrapper).find("input.active"); var selectOptions = multiSelect[0].options; // Special juice to handle "exclude" options based upon competing filterBoxes try { if(($(multiSelect).hasClass('filterComp') && filterCompositeExcludeOptions(multiSelect)) || ($(multiSelect).hasClass('filterTable') && filterTableExcludeOptions(multiSelect))) { // "exclude" items based upon the exclude tag of the true options allCheckboxes.each(function(index) { var item = $(this).parent(); if($(selectOptions[index]).hasClass('excluded')) { $(item).addClass("ui-state-excluded"); } else //if($(item).hasClass("ui-state-excluded")) $(item).removeClass("ui-state-excluded");