jquery.tablesorter: References ignored in sortkey.

Text in elements with class='reference' excluded for sorting.

Bug: T29745
Change-Id: If3969c00cbb7a74362fe85f4cad361da488526d5

diff --git a/resources/src/jquery/jquery.tablesorter.js b/resources/src/jquery/jquery.tablesorter.js
index 8aa22a8..e9d5a91 100644 (file)
--- a/resources/src/jquery/jquery.tablesorter.js
+++ b/resources/src/jquery/jquery.tablesorter.js
@@ -79,7 +79,11 @@
                }
                return $.makeArray( node.childNodes ).map( function ( elem ) {
                        if ( elem.nodeType === Node.ELEMENT_NODE ) {
-                               return getElementSortKey( elem );
+                               if ( $( elem ).hasClass( 'reference' ) ) {
+                                       return null;
+                               } else {
+                                       return getElementSortKey( elem );
+                               }
                        }
                        return $.text( elem );
                } ).join( '' );

diff --git a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
index 23ef26f..74caf5c 100644 (file)
--- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
@@ -1494,5 +1494,33 @@
                        'detectParserForColumn() detect parser.id "number" for second column'
                );
        } );
+       QUnit.test( 'T29745 - References ignored in sortkey', function ( assert ) {
+               var $table, parsers;
+               $table = $(
+                       '<table class="sortable">' +
+                               '<tr><th>A</th></tr>' +
+                               '<tr><td>10</td></tr>' +
+                               '<tr><td>2<sup class="reference"><a href="#cite_note-1">[1]</a></sup></td></tr>' +
+                               '</table>'
+               );
+               $table.tablesorter();
+               $table.find( '.headerSort:eq(0)' ).click();
+
+               assert.deepEqual(
+                       tableExtract( $table ),
+                       [
+                               [ '2[1]' ],
+                               [ '10' ]
+                       ],
+                       'References ignored in sortkey'
+               );
+
+               parsers = $table.data( 'tablesorter' ).config.parsers;
+               assert.equal(
+                       parsers[ 0 ].id,
+                       'number',
+                       'detectParserForColumn() detect parser.id "number"'
+               );
+       } );
 
 }( jQuery, mediaWiki ) );