dbd97cd6ce26f298cb61028829e514c1c79ebfd4 tdreszer Thu Feb 9 14:14:16 2012 -0800 Andy Pohl tripped over a debug message when naming subtracks as {compisteName}_{subtrack}. This is easily fixed and should not be illegal. The debug message did what it was supposed to do. diff --git src/hg/js/subCfg.js src/hg/js/subCfg.js index 9709c0c..ecce356 100644 --- src/hg/js/subCfg.js +++ src/hg/js/subCfg.js @@ -832,41 +832,42 @@ var classList = $( this ).attr("class").split(" "); classList = aryRemove(classList,["viewDD","normalText","changed"]); if (classList.length == 0) warn('DEBUG: View classlist is missing view class.'); else if (classList.length > 1) warn('DEBUG: View classlist contains unexpected classes:' + classList); else { subCfg.viewTags[i] = classList[0]; subCfg.viewInit(subCfg.viewTags[i]); } }); // Tricky for composite level controls. Could wrap cfg controls in new div. // DO THIS AFTER Views // NOTE: excluding sortOrder and showCfg which are special cases we don't care about in subCfg - var compObjs = $('select,input').filter("[name^='"+subCfg.compositeName+"\\.'],[name^='"+subCfg.compositeName+"_']").not(".viewDD"); + // Excluding views and subCBs because a {composite}_{subtrack} naming scheme may be used + var compObjs = $('select,input').filter("[name^='"+subCfg.compositeName+"\\.'],[name^='"+subCfg.compositeName+"_']").not(".viewDD,.subCB"); if (compObjs.length > 0) { $(compObjs).each(function (i) { if (this.type != 'hidden') { // DEBUG ------------- if (this.id != undefined && this.id.length > 0 && $(this).hasClass('filterBy') == false && $(this).hasClass('filterComp') == false) - warn('DEBUG: Not expected control with name ['+this.name + '], and id #'+this.id); - // DEBUG ------------- + warn('DEBUG: Unexpected control with name ['+this.name + '], and id #'+this.id); + // DEBUG ------------- Helps find unexpected problems. $(this).change(function (e) { subCfg.markChange(e,this); subCfg.propagateSetting(this); }); } }); } // Because of fauxDisabled subCBs, it is necessary to truly disable them before submitting. $("FORM").submit(function (i) { $('input.subCB.changed.disabled').attr('disabled',true); // shadows will go to cart as they should // Unchanged controls will be disabled to avoid sending to the cart $('select,input').filter("[name]").not(".allOrOnly").not('.changed').each( function (i) {