928a0042c83303e4dcce0fc204d32630c04f2d09 galt Wed Feb 24 23:06:16 2021 -0800 Fixed existing bug causing "ASSERT: matChkBoxNormalize() called for dim ABC!". This occurred for old-style dimensions that were neither XY matrix nor filterComposite facets. refs #25012 diff --git src/hg/js/hui.js src/hg/js/hui.js index 56db978..518d666 100644 --- src/hg/js/hui.js +++ src/hg/js/hui.js @@ -391,35 +391,35 @@ { // Returns a list of currently indeterminate matCBs. // This is encapsulated to keep consistent with matCbComplete() if (complete) return $("input.matCB").not(".disabled"); else return $("input.matCB.disabled"); } function matCbFindFromSubCb(subCB) { // returns the one matCB associated with a subCB (or undefined) var classList = $( subCB ).attr("class").split(" "); // we need one or 2 classes, depending upon how many dimensions in matrix // (e.g. "subDB GM10847 NFKB aNone IGGrab Signal") classList = aryRemove(classList,["subCB","changed","disabled"]); var classes = classList.slice(0,2).join('.'); // Assume X and Y they are the first 2 - var matCB = $("input.matCB."+classes); // Note, this works for filtering because we want 'AND' + var matCB = $("input.matCB."+classes).not(".abc"); // Note, this works for filtering because we want 'AND' if (matCB.length === 1) return matCB; - matCB = $("input.matCB."+classList[0]); // No hit so this must be a 1D matrix + matCB = $("input.matCB."+classList[0]).not(".abc"); // No hit so this must be a 1D matrix if (matCB.length === 1) return matCB; return undefined; } function matAbcCBfindFromSubCb(subCB) { // returns the abcCBs associated with a subCB (or undefined) var abcCBs = $("input.matCB.abc"); if (abcCBs.length > 0) { var classList = $( subCB ).attr("class").split(" "); classList = aryRemove(classList,["subCB","changed","disabled"]); classList.shift(); // Gets rid of X and Y associated classes (first 2 after subCB) classList.shift();