499355d34f669fed02efa17698493af1a2c78180 tdreszer Fri May 3 16:53:18 2013 -0700 Added protection for massive sets of haplotypes as seen in hgGene CGI. The cutoffs are still evolving. Also fixed some comments as per Angie's review, tightened one sort to ensure deterministic order and made some minor wording changes to the HTML output. diff --git src/hg/js/alleles.js src/hg/js/alleles.js index 72a1a73..9df2f4a 100644 --- src/hg/js/alleles.js +++ src/hg/js/alleles.js @@ -271,39 +271,39 @@ { // sets the current title to show the position of the pointer // Relies upon a span and fixed width text // Note: charsPerPos == 3 to show aa position when showing DNA triplets var e = e || window.event; var over = ((e.pageX - $(obj).offset().left) / seqPxPerPos) + 0.5; // round up $(obj).attr('title',over.toFixed(0)); // title is simply position }, rareAlleleToggle: function (btn,setCart) { // toggle the visibility of rare alleles var trs = $('table#alleles tbody tr.allele'); persistRareHapsShown = ($(btn).val().indexOf('Show') != -1); if (persistRareHapsShown) { $(trs).filter('.rare').removeClass('hidden'); - var counts = $(trs).filter(':visible').length + ' of ' + $(trs).length; + var counts = $(trs).filter(':visible').length + ' of ' + $(trs).length + "."; $('span#alleleCounts').text( 'All gene haplotypes shown: ' + counts ); $('span#alleleCounts').addClass('textAlert'); $(btn).val('Hide rare haplotypes'); if (setCart == undefined || setCart) setCartVar(btn.id,'set'); } else { $(trs).filter('.rare').addClass('hidden'); - var counts = $(trs).filter(':visible').length + ' of ' + $(trs).length; + var counts = $(trs).filter(':visible').length + ' of ' + $(trs).length + "."; $('span#alleleCounts').text( 'Common gene haplotypes shown: ' + counts ); $('span#alleleCounts').removeClass('textAlert'); $(btn).val('Show rare haplotypes'); if (setCart == undefined || setCart) setCartVar(btn.id,'[]'); } hilitesResize(); }, scoresToggle: function (btn,setCart) { // toggle the visibility of scores persistScoresShown = ($(btn).val().indexOf('Show') != -1); if (persistScoresShown) { $('table#alleles').find('.score').removeClass('hidden'); $(btn).val('Hide scoring');