r86108 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r86107‎ | r86108 | r86109 >
Date:08:23, 15 April 2011
Author:diebuche
Status:resolved (Comments)
Tags:needs-js-test 
Comment:
Followup ro r86088: Use data-sort-type instead of classes to specify the parser-type; add support for data-sort-value; strip legacy code (CR)
Modified paths:
  • /trunk/phase3/resources/jquery/jquery.tablesorter.js (modified) (history)
  • /trunk/phase3/skins/common/wikibits.js (modified) (history)

Diff [purge]

Index: trunk/phase3/skins/common/wikibits.js
@@ -357,7 +357,7 @@
358358 for ( var i = 0; i < l; i++ ) {
359359 switch ( cs[i].nodeType ) {
360360 case 1: // ELEMENT_NODE
361 - str += ts_getInnerText( cs[i] );
 361+ str += getInnerText( cs[i] );
362362 break;
363363 case 3: // TEXT_NODE
364364 str += cs[i].nodeValue;
@@ -517,372 +517,6 @@
518518 }
519519 };
520520
521 -/*
522 - * Table sorting script based on one (c) 1997-2006 Stuart Langridge and Joost
523 - * de Valk:
524 - * http://www.joostdevalk.nl/code/sortable-table/
525 - * http://www.kryogenix.org/code/browser/sorttable/
526 - *
527 - * @todo don't break on colspans/rowspans (bug 8028)
528 - * @todo language-specific digit grouping/decimals (bug 8063)
529 - * @todo support all accepted date formats (bug 8226)
530 - */
531 -
532 -window.ts_image_path = stylepath + '/common/images/';
533 -window.ts_image_up = 'sort_up.gif';
534 -window.ts_image_down = 'sort_down.gif';
535 -window.ts_image_none = 'sort_none.gif';
536 -window.ts_europeandate = wgContentLanguage != 'en'; // The non-American-inclined can change to "true"
537 -window.ts_alternate_row_colors = false;
538 -window.ts_number_transform_table = null;
539 -window.ts_number_regex = null;
540 -
541 -window.sortables_init = function() {
542 - var idnum = 0;
543 - // Find all tables with class sortable and make them sortable
544 - var tables = getElementsByClassName( document, 'table', 'sortable' );
545 - for ( var ti = 0; ti < tables.length ; ti++ ) {
546 - if ( !tables[ti].id ) {
547 - tables[ti].setAttribute( 'id', 'sortable_table_id_' + idnum );
548 - ++idnum;
549 - }
550 - ts_makeSortable( tables[ti] );
551 - }
552 -};
553 -
554 -window.ts_makeSortable = function( table ) {
555 - var firstRow = table.rows[0];
556 - if ( !firstRow ) {
557 - return;
558 - }
559 -
560 - // We have a first row: assume it's the header, and make its contents clickable links
561 - for ( var i = 0; i < firstRow.cells.length; i++ ) {
562 - var cell = firstRow.cells[i];
563 - if ( (' ' + cell.className + ' ').indexOf(' unsortable ') == -1 ) {
564 - $(cell).append ( '<a href="#" class="sortheader" '
565 - + 'onclick="ts_resortTable(this);return false;">'
566 - + '<span class="sortarrow">'
567 - + '<img src="'
568 - + ts_image_path
569 - + ts_image_none
570 - + '" alt="&darr;"/></span></a>');
571 - }
572 - }
573 - if ( ts_alternate_row_colors ) {
574 - ts_alternate( table );
575 - }
576 -};
577 -
578 -window.ts_getInnerText = function( el ) {
579 - return getInnerText( el );
580 -};
581 -
582 -window.ts_resortTable = function( lnk ) {
583 - // get the span
584 - var span = lnk.getElementsByTagName('span')[0];
585 -
586 - var td = lnk.parentNode;
587 - var tr = td.parentNode;
588 - var column = td.cellIndex;
589 -
590 - var table = tr.parentNode;
591 - while ( table && !( table.tagName && table.tagName.toLowerCase() == 'table' ) ) {
592 - table = table.parentNode;
593 - }
594 - if ( !table ) {
595 - return;
596 - }
597 -
598 - if ( table.rows.length <= 1 ) {
599 - return;
600 - }
601 -
602 - // Generate the number transform table if it's not done already
603 - if ( ts_number_transform_table === null ) {
604 - ts_initTransformTable();
605 - }
606 -
607 - // Work out a type for the column
608 - // Skip the first row if that's where the headings are
609 - var rowStart = ( table.tHead && table.tHead.rows.length > 0 ? 0 : 1 );
610 - var bodyRows = 0;
611 - if (rowStart == 0 && table.tBodies) {
612 - for (var i=0; i < table.tBodies.length; i++ ) {
613 - bodyRows += table.tBodies[i].rows.length;
614 - }
615 - if (bodyRows < table.rows.length)
616 - rowStart = 1;
617 - }
618 -
619 - var itm = '';
620 - for ( var i = rowStart; i < table.rows.length; i++ ) {
621 - if ( table.rows[i].cells.length > column ) {
622 - itm = ts_getInnerText(table.rows[i].cells[column]);
623 - itm = itm.replace(/^[\s\xa0]+/, '').replace(/[\s\xa0]+$/, '');
624 - if ( itm != '' ) {
625 - break;
626 - }
627 - }
628 - }
629 -
630 - // TODO: bug 8226, localised date formats
631 - var sortfn = ts_sort_generic;
632 - var preprocessor = ts_toLowerCase;
633 - if ( /^\d\d[\/. -][a-zA-Z]{3}[\/. -]\d\d\d\d$/.test( itm ) ) {
634 - preprocessor = ts_dateToSortKey;
635 - } else if ( /^\d\d[\/.-]\d\d[\/.-]\d\d\d\d$/.test( itm ) ) {
636 - preprocessor = ts_dateToSortKey;
637 - } else if ( /^\d\d[\/.-]\d\d[\/.-]\d\d$/.test( itm ) ) {
638 - preprocessor = ts_dateToSortKey;
639 - // (minus sign)([pound dollar euro yen currency]|cents)
640 - } else if ( /(^([-\u2212] *)?[\u00a3$\u20ac\u00a4\u00a5]|\u00a2$)/.test( itm ) ) {
641 - preprocessor = ts_currencyToSortKey;
642 - } else if ( ts_number_regex.test( itm ) ) {
643 - preprocessor = ts_parseFloat;
644 - }
645 -
646 - var reverse = ( span.getAttribute( 'sortdir' ) == 'down' );
647 -
648 - var newRows = new Array();
649 - var staticRows = new Array();
650 - for ( var j = rowStart; j < table.rows.length; j++ ) {
651 - var row = table.rows[j];
652 - if( (' ' + row.className + ' ').indexOf(' unsortable ') < 0 ) {
653 - var keyText = ts_getInnerText( row.cells[column] );
654 - if( keyText === undefined ) {
655 - keyText = '';
656 - }
657 - var oldIndex = ( reverse ? -j : j );
658 - var preprocessed = preprocessor( keyText.replace(/^[\s\xa0]+/, '').replace(/[\s\xa0]+$/, '') );
659 -
660 - newRows[newRows.length] = new Array( row, preprocessed, oldIndex );
661 - } else {
662 - staticRows[staticRows.length] = new Array( row, false, j-rowStart );
663 - }
664 - }
665 -
666 - newRows.sort( sortfn );
667 -
668 - var arrowHTML;
669 - if ( reverse ) {
670 - arrowHTML = '<img src="' + ts_image_path + ts_image_down + '" alt="&darr;"/>';
671 - newRows.reverse();
672 - span.setAttribute( 'sortdir', 'up' );
673 - } else {
674 - arrowHTML = '<img src="' + ts_image_path + ts_image_up + '" alt="&uarr;"/>';
675 - span.setAttribute( 'sortdir', 'down' );
676 - }
677 -
678 - for ( var i = 0; i < staticRows.length; i++ ) {
679 - var row = staticRows[i];
680 - newRows.splice( row[2], 0, row );
681 - }
682 -
683 - // We appendChild rows that already exist to the tbody, so it moves them rather than creating new ones
684 - // don't do sortbottom rows
685 - for ( var i = 0; i < newRows.length; i++ ) {
686 - if ( ( ' ' + newRows[i][0].className + ' ').indexOf(' sortbottom ') == -1 ) {
687 - table.tBodies[0].appendChild( newRows[i][0] );
688 - }
689 - }
690 - // do sortbottom rows only
691 - for ( var i = 0; i < newRows.length; i++ ) {
692 - if ( ( ' ' + newRows[i][0].className + ' ').indexOf(' sortbottom ') != -1 ) {
693 - table.tBodies[0].appendChild( newRows[i][0] );
694 - }
695 - }
696 -
697 - // Delete any other arrows there may be showing
698 - var spans = getElementsByClassName( tr, 'span', 'sortarrow' );
699 - for ( var i = 0; i < spans.length; i++ ) {
700 - spans[i].innerHTML = '<img src="' + ts_image_path + ts_image_none + '" alt="&darr;"/>';
701 - }
702 - span.innerHTML = arrowHTML;
703 -
704 - if ( ts_alternate_row_colors ) {
705 - ts_alternate( table );
706 - }
707 -};
708 -
709 -window.ts_initTransformTable = function() {
710 - if ( typeof wgSeparatorTransformTable == 'undefined'
711 - || ( wgSeparatorTransformTable[0] == '' && wgDigitTransformTable[2] == '' ) )
712 - {
713 - var digitClass = "[0-9,.]";
714 - ts_number_transform_table = false;
715 - } else {
716 - ts_number_transform_table = {};
717 - // Unpack the transform table
718 - // Separators
719 - var ascii = wgSeparatorTransformTable[0].split("\t");
720 - var localised = wgSeparatorTransformTable[1].split("\t");
721 - for ( var i = 0; i < ascii.length; i++ ) {
722 - ts_number_transform_table[localised[i]] = ascii[i];
723 - }
724 - // Digits
725 - ascii = wgDigitTransformTable[0].split("\t");
726 - localised = wgDigitTransformTable[1].split("\t");
727 - for ( var i = 0; i < ascii.length; i++ ) {
728 - ts_number_transform_table[localised[i]] = ascii[i];
729 - }
730 -
731 - // Construct regex for number identification
732 - var digits = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ',', '\\.'];
733 - var maxDigitLength = 1;
734 - for ( var digit in ts_number_transform_table ) {
735 - // Escape regex metacharacters
736 - digits.push(
737 - digit.replace( /([{}()|.?*+^$\[\]\\-])/g, "\\$1" )
738 - );
739 - if ( digit.length > maxDigitLength ) {
740 - maxDigitLength = digit.length;
741 - }
742 - }
743 - if ( maxDigitLength > 1 ) {
744 - var digitClass = '(' + digits.join( '|' ) + ')';
745 - } else {
746 - var digitClass = '[' + digits.join( '' ) + ']';
747 - }
748 - }
749 -
750 - // We allow a trailing percent sign, which we just strip. This works fine
751 - // if percents and regular numbers aren't being mixed.
752 - ts_number_regex = new RegExp(
753 - "^(" +
754 - "[-+\u2212]?[0-9][0-9,]*(\\.[0-9,]*)?(E[-+\u2212]?[0-9][0-9,]*)?" + // Fortran-style scientific
755 - "|" +
756 - "[-+\u2212]?" + digitClass + "+[\s\xa0]*%?" + // Generic localised
757 - ")$", "i"
758 - );
759 -};
760 -
761 -window.ts_toLowerCase = function( s ) {
762 - return s.toLowerCase();
763 -};
764 -
765 -window.ts_dateToSortKey = function( date ) {
766 - // y2k notes: two digit years less than 50 are treated as 20XX, greater than 50 are treated as 19XX
767 - if ( date.length == 11 ) {
768 - switch ( date.substr( 3, 3 ).toLowerCase() ) {
769 - case 'jan':
770 - var month = '01';
771 - break;
772 - case 'feb':
773 - var month = '02';
774 - break;
775 - case 'mar':
776 - var month = '03';
777 - break;
778 - case 'apr':
779 - var month = '04';
780 - break;
781 - case 'may':
782 - var month = '05';
783 - break;
784 - case 'jun':
785 - var month = '06';
786 - break;
787 - case 'jul':
788 - var month = '07';
789 - break;
790 - case 'aug':
791 - var month = '08';
792 - break;
793 - case 'sep':
794 - var month = '09';
795 - break;
796 - case 'oct':
797 - var month = '10';
798 - break;
799 - case 'nov':
800 - var month = '11';
801 - break;
802 - case 'dec':
803 - var month = '12';
804 - break;
805 - // default: var month = '00';
806 - }
807 - return date.substr( 7, 4 ) + month + date.substr( 0, 2 );
808 - } else if ( date.length == 10 ) {
809 - if ( !ts_europeandate ) {
810 - return date.substr( 6, 4 ) + date.substr( 0, 2 ) + date.substr( 3, 2 );
811 - } else {
812 - return date.substr( 6, 4 ) + date.substr( 3, 2 ) + date.substr( 0, 2 );
813 - }
814 - } else if ( date.length == 8 ) {
815 - var yr = date.substr( 6, 2 );
816 - if ( parseInt( yr ) < 50 ) {
817 - yr = '20' + yr;
818 - } else {
819 - yr = '19' + yr;
820 - }
821 - if ( ts_europeandate ) {
822 - return yr + date.substr( 3, 2 ) + date.substr( 0, 2 );
823 - } else {
824 - return yr + date.substr( 0, 2 ) + date.substr( 3, 2 );
825 - }
826 - }
827 - return '00000000';
828 -};
829 -
830 -window.ts_parseFloat = function( s ) {
831 - if ( !s ) {
832 - return 0;
833 - }
834 - if ( ts_number_transform_table != false ) {
835 - var newNum = '', c;
836 -
837 - for ( var p = 0; p < s.length; p++ ) {
838 - c = s.charAt( p );
839 - if ( c in ts_number_transform_table ) {
840 - newNum += ts_number_transform_table[c];
841 - } else {
842 - newNum += c;
843 - }
844 - }
845 - s = newNum;
846 - }
847 - var num = parseFloat( s.replace(/[, ]/g, '').replace("\u2212", '-') );
848 - return ( isNaN( num ) ? -Infinity : num );
849 -};
850 -
851 -window.ts_currencyToSortKey = function( s ) {
852 - return ts_parseFloat(s.replace(/[^-\u22120-9.,]/g,''));
853 -};
854 -
855 -window.ts_sort_generic = function( a, b ) {
856 - return a[1] < b[1] ? -1 : a[1] > b[1] ? 1 : a[2] - b[2];
857 -};
858 -
859 -window.ts_alternate = function( table ) {
860 - // Take object table and get all it's tbodies.
861 - var tableBodies = table.getElementsByTagName( 'tbody' );
862 - // Loop through these tbodies
863 - for ( var i = 0; i < tableBodies.length; i++ ) {
864 - // Take the tbody, and get all it's rows
865 - var tableRows = tableBodies[i].getElementsByTagName( 'tr' );
866 - // Loop through these rows
867 - // Start at 1 because we want to leave the heading row untouched
868 - for ( var j = 0; j < tableRows.length; j++ ) {
869 - // Check if j is even, and apply classes for both possible results
870 - var oldClasses = tableRows[j].className.split(' ');
871 - var newClassName = '';
872 - for ( var k = 0; k < oldClasses.length; k++ ) {
873 - if ( oldClasses[k] != '' && oldClasses[k] != 'even' && oldClasses[k] != 'odd' ) {
874 - newClassName += oldClasses[k] + ' ';
875 - }
876 - }
877 - tableRows[j].className = newClassName + ( j % 2 == 0 ? 'even' : 'odd' );
878 - }
879 - }
880 -};
881 -
882 -/*
883 - * End of table sorting code
884 - */
885 -
886 -
887521 /**
888522 * Add a cute little box at the top of the screen to inform the user of
889523 * something, replacing any preexisting message.
@@ -981,8 +615,6 @@
982616 updateTooltipAccessKeys( null );
983617 setupCheckboxShiftClick();
984618
985 - //jQuery( document ).ready( sortables_init );
986 -
987619 // Run any added-on functions
988620 for ( var i = 0; i < onloadFuncts.length; i++ ) {
989621 onloadFuncts[i]();
Index: trunk/phase3/resources/jquery/jquery.tablesorter.js
@@ -92,7 +92,8 @@
9393 /* parsers utils */
9494
9595 function buildParserCache( table, $headers ) {
96 - var rows = table.tBodies[0].rows;
 96+ var rows = table.tBodies[0].rows,
 97+ sortType;
9798
9899 if ( rows[0] ) {
99100
@@ -101,11 +102,14 @@
102103 l = cells.length;
103104
104105 for ( var i = 0; i < l; i++ ) {
 106+ p = false;
 107+ sortType = $headers.eq(i).data('sort-type');
 108+ if ( typeof sortVal != 'undefined' ) {
 109+ p = getParserById( sortVal );
 110+ }
105111
106 - if ( $headers.eq(i).is( '[class*="sort-"]' ) ) {
107 - p = getParserById($headers.eq(i).attr('class').replace(/.*?sort-(.*?) .*/, '$1'));
108 - } else {
109 - p = detectParserForColumn( table, rows, -1, i );
 112+ if (p === false) {
 113+ p = detectParserForColumn( table, rows, -1, i );
110114 }
111115 // if ( table.config.debug ) {
112116 // console.log( "column:" + i + " parser:" + p.id + "\n" );
@@ -125,7 +129,7 @@
126130 rowIndex++;
127131 if ( rows[rowIndex] ) {
128132 node = getNodeFromRowAndCellIndex( rows, rowIndex, cellIndex );
129 - nodeValue = trimAndGetNodeText( table.config, node );
 133+ nodeValue = trimAndGetNodeText( node );
130134 // if ( table.config.debug ) {
131135 // console.log( 'Checking if value was empty on row:' + rowIndex );
132136 // }
@@ -146,8 +150,8 @@
147151 return rows[rowIndex].cells[cellIndex];
148152 }
149153
150 - function trimAndGetNodeText( config, node ) {
151 - return $.trim( getElementText( config, node ) );
 154+ function trimAndGetNodeText( node ) {
 155+ return $.trim( getElementText( node ) );
152156 }
153157
154158 function getParserById( name ) {
@@ -192,7 +196,7 @@
193197 cache.row.push(c);
194198
195199 for ( var j = 0; j < totalCells; ++j ) {
196 - cols.push( parsers[j].format( getElementText( table.config, c[0].cells[j] ), table, c[0].cells[j] ) );
 200+ cols.push( parsers[j].format( getElementText( c[0].cells[j] ), table, c[0].cells[j] ) );
197201 }
198202
199203 cols.push( cache.normalized.length ); // add position for rowCache
@@ -206,8 +210,14 @@
207211 return cache;
208212 }
209213
210 - function getElementText( config, node ) {
211 - return $( node ).text();
 214+ function getElementText( node ) {
 215+ var n = $( node );
 216+ var sortValue = n.data('sort-value');
 217+ if ( typeof sortValue != 'undefined' ) {
 218+ return sortValue;
 219+ } else {
 220+ return n.text();
 221+ }
212222 }
213223
214224 function appendToTable( table, cache ) {
@@ -253,7 +263,7 @@
254264 this.column = realCellIndex;
255265
256266 var colspan = this.colspan;
257 - colspan = colspan ? parseInt( colspan ) : 1;
 267+ colspan = colspan ? parseInt( colspan, 10 ) : 1;
258268 realCellIndex += colspan;
259269
260270 //this.column = header_index[this.parentNode.rowIndex + "-" + this.cellIndex];
@@ -385,18 +395,6 @@
386396 }
387397 }
388398
389 - // function updateHeaderSortCount( table, sortList ) {
390 - // var c = table.config,
391 - // l = sortList.length;
392 - // for ( var i = 0; i < l; i++ ) {
393 - // var s = sortList[i],
394 - // o = c.headerList[s[0]];
395 - // o.count = s[1];
396 - // o.count++;
397 - // }
398 - // }
399 - /* sorting methods */
400 -
401399 function multisort( table, sortList, cache ) {
402400 // if ( table.config.debug ) {
403401 // var sortTime = new Date();
@@ -699,7 +697,7 @@
700698 // var pos = [( cell.parentNode.rowIndex - 1 ), cell.cellIndex];
701699 // // update cache
702700 // cache.normalized[pos[0]][pos[1]] = config.parsers[pos[1]].format(
703 - // getElementText( config, cell ), cell );
 701+ // getElementText( cell ), cell );
704702 // } ).bind( "sorton", function ( e, list ) {
705703 // $( this ).trigger( "sortStart" );
706704 // config.sortList = list;
@@ -750,7 +748,7 @@
751749 return ( isNaN(i)) ? 0 : i;
752750 };
753751 this.formatInt = function (s) {
754 - var i = parseInt(s);
 752+ var i = parseInt( s, 10 );
755753 return ( isNaN(i)) ? 0 : i;
756754 };
757755 this.clearTableBody = function ( table ) {
@@ -897,13 +895,13 @@
898896 s = s.split('/');
899897
900898 //Pad Month and Day
901 - if ( s[0].length == 1 ) s[0] = "0" + s[0];
902 - if ( s[1].length == 1 ) s[1] = "0" + s[1];
 899+ if ( s[0] && s[0].length == 1 ) s[0] = "0" + s[0];
 900+ if ( s[1] && s[1].length == 1 ) s[1] = "0" + s[1];
903901
904902 if ( !s[2] ) {
905903 //Fix yearless dates
906904 s[2] = 2000;
907 - } else if ( ( y = parseInt( s[2] ) ) < 100 ) {
 905+ } else if ( ( y = parseInt( s[2], 10) ) < 100 ) {
908906 //Guestimate years without centuries
909907 if ( y < 30 ) {
910908 s[2] = 2000 + y;
@@ -920,7 +918,7 @@
921919 s.push( s.shift() );
922920 s.push(d);
923921 }
924 - return parseInt( s.join('') );
 922+ return parseInt( s.join(''), 10 );
925923 },
926924 type: "numeric"
927925 } );

Follow-up revisions

RevisionCommit summaryAuthorDate
r86109r86108: Fix var namediebuche08:31, 15 April 2011
r86854Followup to r86108: jQuery tries to be too smart and converts the string to a...diebuche13:15, 25 April 2011
r87172Followup to r86108 per CR: Fix two calls to legacy tablesorterdiebuche18:58, 30 April 2011
r96384jquery.tablesorter.test: Add tests for data-sort-value...krinkle23:09, 6 September 2011
r96509Followup to r86108, r86854, r96384: table sorter fetch of 'data-sort-value' a...brion22:03, 7 September 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r86088Completely rewritten table sorting script....diebuche21:47, 14 April 2011

Comments

#Comment by Nikerabbit (talk | contribs)   07:03, 25 April 2011

It's still not working. It always sorts by the first column regardless of what is clicked.

#Comment by DieBuche (talk | contribs)   10:57, 25 April 2011

It seems to work fine in my trunk in various browsers & tables. Could you post some details?

#Comment by Nikerabbit (talk | contribs)   12:15, 25 April 2011
#Comment by Brion VIBBER (talk | contribs)   22:30, 22 June 2011

I don't see the described problem at that URL at present; is this something that's gone away in the meantime, or do you still see it Nike?

#Comment by Nikerabbit (talk | contribs)   05:38, 23 June 2011

It was fixed in later commit.

#Comment by Krinkle (talk | contribs)   22:26, 27 April 2011

Are you sure non of these legacy global functions are used anywhere in core or by extensions ?

#Comment by DieBuche (talk | contribs)   02:52, 28 April 2011

Thanks for reminding: Legacy globals are in use at: extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js and copied from there to /LiquidThreads/js/lqt.toolbar.js

I'll fix those or readd the globals

#Comment by Brion VIBBER (talk | contribs)   20:07, 22 June 2011

Needs JS tests; will end up reverted along with r86088 and friends if regressions are not fixed.

#Comment by Siebrand (talk | contribs)   15:09, 6 September 2011

Just so that a reviewer does not have to look it up: r86088 was set to resolved by TheDJ on 14 Aug 2011.

#Comment by DieBuche (talk | contribs)   12:42, 6 July 2011

Remarking as new

#Comment by Krinkle (talk | contribs)   23:09, 6 September 2011

Unit tests for data-sort-value added in r96384.

#Comment by Brion VIBBER (talk | contribs)   22:14, 7 September 2011

This test uncovered a bug on IE 6/7, fixed in r96509.

#Comment by Brion VIBBER (talk | contribs)   18:07, 13 September 2011

Fixes noted above resolve known issues thx to tests -- marking resolved.

#Comment by Krinkle (talk | contribs)   23:04, 17 September 2011

Still needs a test for data-sort-type.

Status & tagging log