f9c068638aaeddd15d998a5fa840e08898c6e83b kate Tue Mar 20 22:55:59 2012 -0700 Changes responding to QA (redmine #5149, issues note 27). 1. Save user-selected search type in cookie so it persists across pages. 2. Include ChIP-seq in cell-based experiment table on data summary page. 3. encode URL passed to hgEncodeVocab so cells having terms with weird chars (e.g. +) will work. Also, override extra search dropdowns (until figure out how to remove mdbVar cart vars by URL) diff --git src/hg/js/encodeDataMatrix.js src/hg/js/encodeDataMatrix.js index 731b423..6f47fc2 100644 --- src/hg/js/encodeDataMatrix.js +++ src/hg/js/encodeDataMatrix.js @@ -168,29 +168,32 @@ $td.data({ 'dataType' : dataType, 'cellType' : cellType }); $td.mouseover(function() { $(this).attr('title', 'Click to select: ' + encodeProject.getDataType($(this).data().dataType).label + ' ' + ' in ' + $(this).data().cellType +' cells'); }); $td.click(function() { var url = encodeMatrix.getSearchUrl(encodeProject.getAssembly()); // TODO: encapsulate var names url += ('&hgt_mdbVar1=dataType&hgt_mdbVal1=' + $(this).data().dataType + '&hgt_mdbVar2=cell&hgt_mdbVal2=' + $(this).data().cellType + - '&hgt_mdbVar3=view&hgt_mdbVal3=Any'); + '&hgt_mdbVar3=view&hgt_mdbVal3=Any' + + // TODO: figure out how to remove mdbVar4 + '&hgt_mdbVar4=view&hgt_mdbVal4=Any' + ); // specifying window name limits open window glut window.open(url, "searchWindow"); }); }); }); } // initialize application encodeMatrix.start($matrixTable); // load data from server and do callback encodeProject.loadAllFromServer(requests, handleServerData); });