afdb90131d5c0ea91574e4fb65fc7983e6b5551f tdreszer Mon Feb 6 15:29:14 2012 -0800 Fix some edge cases when superChild composite is hidden by its superParent. Redmine 6622 diff --git src/hg/js/subCfg.js src/hg/js/subCfg.js index 97637ce..84eeb37 100644 --- src/hg/js/subCfg.js +++ src/hg/js/subCfg.js @@ -669,33 +669,33 @@ $(this).unbind('blur'); $(this).unbind('click'); } if (this.selectedIndex == 0) { // setting to hide so uncheck and disable. // Easiest is to uncheck subCB and reset vis // so that the reverse action makes sense var subCb = normed($("input[name='" + this.name + "_sel']")); if (subCb != undefined) { subCfg.checkOneSubtrack(subCb,false,true); subCfg.inheritSetting(this,true); } else { warn('DEBUG: Cant find subCB for ' + this.name); } } else { subCfg.markChange(e,this); - // if just being made visible then composite to full? NO (implications to other subs) - // Make view visible? NO (subtrack override) - // reshape? NO (much too complex) + // If made visible, be sure to make composite visible + if (this.selectedIndex > 0) + exposeAll(); } }); }, enableCfg: function (subCb,setTo) { // Enables or disables subVis and wrench var tr = normed($(subCb).closest('tr')); if (tr == undefined) { warn("DEBUG: subCfg.enableCfg() could not find TR for CB: "+subCb.name); return false; } var subFaux = normed($(tr).find('div.subVisDD')); if (subFaux != undefined) { if (setTo == true) $(subFaux).removeClass('disabled');