72e76d115bf56e6e998b757f17112e3ee14ebd99 kate Thu Mar 22 11:13:45 2012 -0700 Better method of suppressing extra search dropdowns from URL diff --git src/hg/js/encodeChipMatrix.js src/hg/js/encodeChipMatrix.js index 775f8e4..d73b8ef 100644 --- src/hg/js/encodeChipMatrix.js +++ src/hg/js/encodeChipMatrix.js @@ -167,41 +167,43 @@ // fill in count, mouseover and selection by click $td.addClass('experiment'); $td.text(matrix[cellType][target]); $td.data({ 'target' : target, 'cellType' : cellType }); $td.mouseover(function() { $(this).attr('title', 'Click to select: ' + ($(this).data().target) + ' ' + ' in ' + $(this).data().cellType +' cells'); }); $td.click(function() { var url, antibodyTarget; - // TODO: encapsulate var names - // TODO: search on antibody + // NOTE: generating full search URL should be generalized & encapsulated url = encodeMatrix.getSearchUrl(encodeProject.getAssembly()); url += ('&hgt_mdbVar1=dataType&hgt_mdbVal1=' + 'ChipSeq' + '&hgt_mdbVar2=cell&hgt_mdbVal2=' + $(this).data().cellType + '&hgt_mdbVar3=antibody'); - // TODO: html encode ? antibodyTarget = encodeProject.getAntibodyTarget($(this).data().target); + // TODO: html encode ? $.each(antibodyTarget.antibodies, function (i, antibody) { url += ('&hgt_mdbVal3=' + antibody); }); url += '&hgt_mdbVar4=view&hgt_mdbVal4=Any'; - // TODO: open search window + + // remove extra rows + url += '&hgt_mdbVar5=[]'; + url += '&hgt_mdbVar6=[]'; window.open(url, "searchWindow"); }); }); }); } // initialize encodeMatrix.start($matrixTable); // load data from server and set up callback encodeProject.loadAllFromServer(requests, handleServerData); });