d56bc09614b5ad60ec9defcd02af1eabed9fabe3 kate Sat Oct 29 23:05:02 2011 -0700 1. Add spinner while ajax data is loading 2. Clean up ChIP Matrix similarly to others diff --git src/hg/js/encodeDataSummary.js src/hg/js/encodeDataSummary.js index 16fd828..af93a8d 100644 --- src/hg/js/encodeDataSummary.js +++ src/hg/js/encodeDataSummary.js @@ -70,30 +70,34 @@ antibodyHash = {}, dataTypeHash = {}, refGenomeExps = {}, cellAssayExps = {}, tfbsExps = {}, antibody, target, dataType, total, refGenomeTypes = [], elementTypes = [], tfbsTypes = [], organism, assembly, header; // variables passed in hidden fields organism = encodeDataSummary_organism; assembly = encodeDataSummary_assembly; header = encodeDataSummary_pageHeader; + hideLoadingImage(spinner); + $('.summaryTable').show(); + $('#searchTypePanel').show(); + $("#pageHeader").text(header); document.title = 'ENCODE ' + header; $.each(antibodies, function (i, item) { antibodyHash[item.term] = item; }); $.each(dataTypes, function (i, item) { dataTypeHash[item.term] = item; dataTypeLabelHash[item.label] = item; }); $.each(experiments, function (i, exp) { // todo: filter out with arg to hgApi if (exp.organism !== organism) { return true; @@ -147,21 +151,26 @@ window.location = "encodeChipMatrixHuman.html"; }); } // get server from calling web page (intended for genome-preview) if ('encodeDataMatrix_server' in window) { server = encodeDataMatrix_server; } else { server = document.location.hostname; // or document.domain ? } // initialize encodeProject.setup({ server: server }); + // show only spinner until data is retrieved + spinner = showLoadingImage("spinner"); + // add radio buttons for search type to specified div on page encodeProject.addSearchPanel('#searchTypePanel'); + $('#searchTypePanel').hide(); + $('.summaryTable').hide(); // load data from server encodeProject.loadAllFromServer(requests, handleServerData); });