Merge "TableSorter: Avoid Sizzle selectors"

diff --combined resources/src/jquery.tablesorter/jquery.tablesorter.js
index 0c28b8e,4a506ee..d34b06c
--- 1/resources/src/jquery.tablesorter/jquery.tablesorter.js
--- 2/resources/src/jquery.tablesorter/jquery.tablesorter.js
+++ b/resources/src/jquery.tablesorter/jquery.tablesorter.js
@@@ -283,7 -283,7 +283,7 @@@
                                }
                                $thead.append( this );
                        } );
-                       $table.find( ' > tbody:first' ).before( $thead );
+                       $table.find( ' > tbody' ).first().before( $thead );
                }
                if ( !$table.get( 0 ).tFoot ) {
                        $tfoot = $( '<tfoot>' );
@@@ -322,7 -322,7 +322,7 @@@
                        headerIndex,
                        exploded,
                        $tableHeaders = $( [] ),
-                       $tableRows = $( 'thead:eq(0) > tr', table );
+                       $tableRows = $( table ).find( 'thead' ).eq( 0 ).find( '> tr' );
  
                if ( $tableRows.length <= 1 ) {
                        $tableHeaders = $tableRows.children( 'th' );
@@@ -480,37 -480,25 +480,37 @@@
        }
  
        function sortText( a, b ) {
 -              return ( ( a < b ) ? -1 : ( ( a > b ) ? 1 : 0 ) );
 +              return ts.collator.compare( a, b );
        }
  
 -      function sortTextDesc( a, b ) {
 -              return ( ( b < a ) ? -1 : ( ( b > a ) ? 1 : 0 ) );
 +      function sortNumeric( a, b ) {
 +              return ( ( a < b ) ? -1 : ( ( a > b ) ? 1 : 0 ) );
        }
  
        function multisort( table, sortList, cache ) {
                var i,
 -                      sortFn = [];
 +                      sortFn = [],
 +                      parsers = $( table ).data( 'tablesorter' ).config.parsers;
  
                for ( i = 0; i < sortList.length; i++ ) {
 -                      sortFn[ i ] = ( sortList[ i ][ 1 ] ) ? sortTextDesc : sortText;
 +                      // Android doesn't support Intl.Collator
 +                      if ( window.Intl && Intl.Collator && parsers[ sortList[ i ][ 0 ] ].type === 'text' ) {
 +                              sortFn[ i ] = sortText;
 +                      } else {
 +                              sortFn[ i ] = sortNumeric;
 +                      }
                }
                cache.normalized.sort( function ( array1, array2 ) {
                        var i, col, ret;
                        for ( i = 0; i < sortList.length; i++ ) {
                                col = sortList[ i ][ 0 ];
 -                              ret = sortFn[ i ].call( this, array1[ col ], array2[ col ] );
 +                              if ( sortList[ i ][ 1 ] ) {
 +                                      // descending
 +                                      ret = sortFn[ i ].call( this, array2[ col ], array1[ col ] );
 +                              } else {
 +                                      // ascending
 +                                      ret = sortFn[ i ].call( this, array1[ col ], array2[ col ] );
 +                              }
                                if ( ret !== 0 ) {
                                        return ret;
                                }
@@@ -738,7 -726,7 +738,7 @@@
                }
        }
  
 -      function buildCollationTable() {
 +      function buildCollation() {
                var key, keys = [];
                ts.collationTable = mw.config.get( 'tableSorterCollation' );
                ts.collationRegex = null;
@@@ -751,14 -739,6 +751,14 @@@
                                ts.collationRegex = new RegExp( keys.join( '|' ), 'ig' );
                        }
                }
 +              if ( window.Intl && Intl.Collator ) {
 +                      ts.collator = new Intl.Collator( [
 +                              mw.config.get( 'wgPageContentLanguage' ),
 +                              mw.config.get( 'wgUserLanguage' )
 +                      ], {
 +                              numeric: true
 +                      } );
 +              }
        }
  
        function cacheRegexs() {
@@@ -899,7 -879,7 +899,7 @@@
                                        // may customize tableSorterCollation but load after $.ready(), other
                                        // scripts may call .tablesorter() before they have done the
                                        // tableSorterCollation customizations.
 -                                      buildCollationTable();
 +                                      buildCollation();
  
                                        // Legacy fix of .sortbottoms
                                        // Wrap them inside a tfoot (because that's what they actually want to be)
@@@ -1104,7 -1084,7 +1104,7 @@@
                        buildTransformTable();
                        buildDateTable();
                        cacheRegexs();
 -                      buildCollationTable();
 +                      buildCollation();
  
                        return getParserById( id );
                },
@@@ -1130,20 -1110,12 +1130,20 @@@
                },
                format: function ( s ) {
                        var tsc;
 -                      s = s.toLowerCase().trim();
 +                      s = s.trim();
                        if ( ts.collationRegex ) {
                                tsc = ts.collationTable;
                                s = s.replace( ts.collationRegex, function ( match ) {
 -                                      var r = tsc[ match ] ? tsc[ match ] : tsc[ match.toUpperCase() ];
 -                                      return r.toLowerCase();
 +                                      var r,
 +                                              upper = match.toUpperCase(),
 +                                              lower = match.toLowerCase();
 +                                      if ( upper === match && !lower === match ) {
 +                                              r = tsc[ lower ] ? tsc[ lower ] : tsc[ upper ];
 +                                              r = r.toUpperCase();
 +                                      } else {
 +                                              r = tsc[ match.toLowerCase() ];
 +                                      }
 +                                      return r;
                                } );
                        }
                        return s;

diff --combined tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
index f5de3ae,fc0eecc..2711ddf
--- 1/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
--- 2/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
@@@ -64,43 -64,21 +64,43 @@@
                        [ 'Günther' ],
                        [ 'Peter' ],
                        [ 'Björn' ],
 +                      [ 'ä' ],
 +                      [ 'z' ],
                        [ 'Bjorn' ],
 +                      [ 'BjÖrn' ],
 +                      [ 'apfel' ],
                        [ 'Apfel' ],
                        [ 'Äpfel' ],
                        [ 'Strasse' ],
                        [ 'Sträßschen' ]
                ],
 -              umlautWordsSorted = [
 +              umlautWordsSortedEn = [
 +                      [ 'ä' ],
                        [ 'Äpfel' ],
 +                      [ 'apfel' ],
                        [ 'Apfel' ],
                        [ 'Björn' ],
 +                      [ 'BjÖrn' ],
                        [ 'Bjorn' ],
                        [ 'Günther' ],
                        [ 'Peter' ],
                        [ 'Sträßschen' ],
 -                      [ 'Strasse' ]
 +                      [ 'Strasse' ],
 +                      [ 'z' ]
 +              ],
 +              umlautWordsSortedSv = [
 +                      [ 'apfel' ],
 +                      [ 'Apfel' ],
 +                      [ 'Bjorn' ],
 +                      [ 'Björn' ],
 +                      [ 'BjÖrn' ],
 +                      [ 'Günther' ],
 +                      [ 'Peter' ],
 +                      [ 'Strasse' ],
 +                      [ 'Sträßschen' ],
 +                      [ 'z' ],
 +                      [ 'ä' ], // ä sorts after z in Swedish
 +                      [ 'Äpfel' ]
                ],
  
                // Data set "digraph"
@@@ -391,7 -369,7 +391,7 @@@
                planetsAscName,
                function ( $table ) {
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
        tableTest(
@@@ -401,7 -379,7 +401,7 @@@
                planetsAscName,
                function ( $table ) {
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
        tableTest(
@@@ -411,9 -389,9 +411,9 @@@
                planetsAscName,
                function ( $table ) {
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
-                       $table.find( '.headerSort:eq(1)' ).trigger( 'click' );
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 1 ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
        tableTest(
@@@ -423,7 -401,7 +423,7 @@@
                reversed( planetsAscName ),
                function ( $table ) {
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' ).trigger( 'click' );
                }
        );
        tableTest(
@@@ -433,7 -411,7 +433,7 @@@
                planetsAscRadius,
                function ( $table ) {
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(1)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 1 ).trigger( 'click' );
                }
        );
        tableTest(
@@@ -443,7 -421,7 +443,7 @@@
                reversed( planetsAscRadius ),
                function ( $table ) {
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(1)' ).trigger( 'click' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 1 ).trigger( 'click' ).trigger( 'click' );
                }
        );
        tableTest(
@@@ -505,7 -483,7 +505,7 @@@
                        $table.tablesorter(
                                { sortList: [ { 0: 'asc' }, { 1: 'asc' } ] }
                        );
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
        tableTest(
@@@ -518,12 -496,12 +518,12 @@@
                        $table.tablesorter(
                                { sortList: [ { 0: 'desc' }, { 1: 'desc' } ] }
                        );
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
  
                        // Pretend to click while pressing the multi-sort key
                        event = $.Event( 'click' );
                        event[ $table.data( 'tablesorter' ).config.sortMultiSortKey ] = true;
-                       $table.find( '.headerSort:eq(1)' ).trigger( event );
+                       $table.find( '.headerSort' ).eq( 1 ).trigger( event );
                }
        );
        QUnit.test( 'Reset sorting making table appear unsorted', function ( assert ) {
@@@ -563,11 -541,12 +563,12 @@@
                [ aaa1, aab5, abc3, bbc2, caa4 ],
                function ( $table ) {
                        // Make colspanned header for test
-                       $table.find( 'tr:eq(0) th:eq(1), tr:eq(0) th:eq(2)' ).remove();
-                       $table.find( 'tr:eq(0) th:eq(0)' ).attr( 'colspan', '3' );
+                       $table.find( 'tr th' ).eq( 1 ).remove();
+                       $table.find( 'tr th' ).eq( 1 ).remove();
+                       $table.find( 'tr th' ).eq( 0 ).attr( 'colspan', '3' );
  
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
        tableTest( 'Sorting with colspanned headers: sort spanned column twice',
@@@ -576,12 -555,13 +577,13 @@@
                [ caa4, bbc2, abc3, aab5, aaa1 ],
                function ( $table ) {
                        // Make colspanned header for test
-                       $table.find( 'tr:eq(0) th:eq(1), tr:eq(0) th:eq(2)' ).remove();
-                       $table.find( 'tr:eq(0) th:eq(0)' ).attr( 'colspan', '3' );
+                       $table.find( 'tr th' ).eq( 1 ).remove();
+                       $table.find( 'tr th' ).eq( 1 ).remove();
+                       $table.find( 'tr' ).eq( 0 ).find( 'th' ).eq( 0 ).attr( 'colspan', '3' );
  
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
        tableTest( 'Sorting with colspanned headers: subsequent column',
@@@ -590,11 -570,12 +592,12 @@@
                [ aaa1, bbc2, abc3, caa4, aab5 ],
                function ( $table ) {
                        // Make colspanned header for test
-                       $table.find( 'tr:eq(0) th:eq(1), tr:eq(0) th:eq(2)' ).remove();
-                       $table.find( 'tr:eq(0) th:eq(0)' ).attr( 'colspan', '3' );
+                       $table.find( 'tr th' ).eq( 1 ).remove();
+                       $table.find( 'tr th' ).eq( 1 ).remove();
+                       $table.find( 'tr th' ).eq( 0 ).attr( 'colspan', '3' );
  
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(1)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 1 ).trigger( 'click' );
                }
        );
        tableTest( 'Sorting with colspanned headers: sort subsequent column twice',
@@@ -603,22 -584,23 +606,23 @@@
                [ aab5, caa4, abc3, bbc2, aaa1 ],
                function ( $table ) {
                        // Make colspanned header for test
-                       $table.find( 'tr:eq(0) th:eq(1), tr:eq(0) th:eq(2)' ).remove();
-                       $table.find( 'tr:eq(0) th:eq(0)' ).attr( 'colspan', '3' );
+                       $table.find( 'tr th' ).eq( 1 ).remove();
+                       $table.find( 'tr th' ).eq( 1 ).remove();
+                       $table.find( 'tr th' ).eq( 0 ).attr( 'colspan', '3' );
  
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(1)' ).trigger( 'click' );
-                       $table.find( '.headerSort:eq(1)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 1 ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 1 ).trigger( 'click' );
                }
        );
  
        QUnit.test( 'Basic planet table: one unsortable column', function ( assert ) {
                var $table = tableCreate( header, planets ),
                        $cell;
-               $table.find( 'tr:eq(0) > th:eq(0)' ).addClass( 'unsortable' );
+               $table.find( 'tr > th' ).eq( 0 ).addClass( 'unsortable' );
  
                $table.tablesorter();
-               $table.find( 'tr:eq(0) > th:eq(0)' ).trigger( 'click' );
+               $table.find( 'tr > th' ).eq( 0 ).trigger( 'click' );
  
                assert.deepEqual(
                        tableExtract( $table ),
@@@ -626,8 -608,8 +630,8 @@@
                        'table not sorted'
                );
  
-               $cell = $table.find( 'tr:eq(0) > th:eq(0)' );
-               $table.find( 'tr:eq(0) > th:eq(1)' ).trigger( 'click' );
+               $cell = $table.find( 'tr > th' ).eq( 0 );
+               $table.find( 'tr > th' ).eq( 1 ).trigger( 'click' );
  
                assert.strictEqual(
                        $cell.hasClass( 'headerSortUp' ) || $cell.hasClass( 'headerSortDown' ),
@@@ -668,7 -650,7 +672,7 @@@
                        mw.config.set( 'wgPageContentLanguage', 'de' );
  
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
  
@@@ -695,7 -677,7 +699,7 @@@
                        mw.config.set( 'wgDefaultDateFormat', 'mdy' );
  
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
  
@@@ -706,7 -688,7 +710,7 @@@
                ipv4Sorted,
                function ( $table ) {
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
        tableTest(
@@@ -716,7 -698,7 +720,7 @@@
                reversed( ipv4Sorted ),
                function ( $table ) {
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' ).trigger( 'click' );
                }
        );
  
@@@ -724,7 -706,7 +728,7 @@@
                'Accented Characters with custom collation',
                [ 'Name' ],
                umlautWords,
 -              umlautWordsSorted,
 +              umlautWordsSortedEn,
                function ( $table ) {
                        mw.config.set( 'tableSorterCollation', {
                                ä: 'ae',
@@@ -734,23 -716,10 +738,23 @@@
                        } );
  
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
  
 +      tableTest(
 +              'Accented Characters Swedish locale',
 +              [ 'Name' ],
 +              umlautWords,
 +              umlautWordsSortedSv,
 +              function ( $table ) {
 +                      mw.config.set( 'wgPageContentLanguage', 'sv' );
 +
 +                      $table.tablesorter();
 +                      $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
 +              }
 +      );
 +
        tableTest(
                'Digraphs with custom collation',
                [ 'City' ],
@@@ -763,7 -732,7 +767,7 @@@
                        } );
  
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
  
@@@ -772,15 -741,16 +776,16 @@@
  
                // Modify the table to have a multiple-row-spanning cell:
                // - Remove 2nd cell of 4th row, and, 2nd cell or 5th row.
-               $table.find( 'tr:eq(3) td:eq(1), tr:eq(4) td:eq(1)' ).remove();
+               $table.find( 'tr' ).eq( 3 ).find( 'td' ).eq( 1 ).remove();
+               $table.find( 'tr' ).eq( 4 ).find( 'td' ).eq( 1 ).remove();
                // - Set rowspan for 2nd cell of 3rd row to 3.
                //   This covers the removed cell in the 4th and 5th row.
-               $table.find( 'tr:eq(2) td:eq(1)' ).attr( 'rowspan', '3' );
+               $table.find( 'tr' ).eq( 2 ).find( 'td' ).eq( 1 ).attr( 'rowspan', '3' );
  
                $table.tablesorter();
  
                assert.strictEqual(
-                       $table.find( 'tr:eq(2) td:eq(1)' ).prop( 'rowSpan' ),
+                       $table.find( 'tr' ).eq( 2 ).find( 'td' ).eq( 1 ).prop( 'rowSpan' ),
                        3,
                        'Rowspan not exploded'
                );
@@@ -804,13 -774,14 +809,14 @@@
                function ( $table ) {
                        // Modify the table to have a multiple-row-spanning cell:
                        // - Remove 2nd cell of 4th row, and, 2nd cell or 5th row.
-                       $table.find( 'tr:eq(3) td:eq(1), tr:eq(4) td:eq(1)' ).remove();
+                       $table.find( 'tr' ).eq( 3 ).find( 'td' ).eq( 1 ).remove();
+                       $table.find( 'tr' ).eq( 4 ).find( 'td' ).eq( 1 ).remove();
                        // - Set rowspan for 2nd cell of 3rd row to 3.
                        //   This covers the removed cell in the 4th and 5th row.
-                       $table.find( 'tr:eq(2) td:eq(1)' ).attr( 'rowspan', '3' );
+                       $table.find( 'tr' ).eq( 2 ).find( 'td' ).eq( 1 ).attr( 'rowspan', '3' );
  
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
        tableTest(
@@@ -821,10 -792,11 +827,11 @@@
                function ( $table ) {
                        // Modify the table to have a multiple-row-spanning cell:
                        // - Remove 2nd cell of 4th row, and, 2nd cell or 5th row.
-                       $table.find( 'tr:eq(3) td:eq(1), tr:eq(4) td:eq(1)' ).remove();
+                       $table.find( 'tr' ).eq( 3 ).find( 'td' ).eq( 1 ).remove();
+                       $table.find( 'tr' ).eq( 4 ).find( 'td' ).eq( 1 ).remove();
                        // - Set rowspan for 2nd cell of 3rd row to 3.
                        //   This covers the removed cell in the 4th and 5th row.
-                       $table.find( 'tr:eq(2) td:eq(1)' ).attr( 'rowspan', '3' );
+                       $table.find( 'tr' ).eq( 2 ).find( 'td' ).eq( 1 ).attr( 'rowspan', '3' );
  
                        $table.tablesorter( { sortList: [
                                { 0: 'asc' }
@@@ -839,13 -811,14 +846,14 @@@
                function ( $table ) {
                        // Modify the table to have a multiple-row-spanning cell:
                        // - Remove 1st cell of 4th row, and, 1st cell or 5th row.
-                       $table.find( 'tr:eq(3) td:eq(0), tr:eq(4) td:eq(0)' ).remove();
+                       $table.find( 'tr' ).eq( 3 ).find( 'td' ).eq( 0 ).remove();
+                       $table.find( 'tr' ).eq( 4 ).find( 'td' ).eq( 0 ).remove();
                        // - Set rowspan for 1st cell of 3rd row to 3.
                        //   This covers the removed cell in the 4th and 5th row.
-                       $table.find( 'tr:eq(2) td:eq(0)' ).attr( 'rowspan', '3' );
+                       $table.find( 'tr' ).eq( 2 ).find( 'td' ).eq( 0 ).attr( 'rowspan', '3' );
  
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
  
@@@ -858,7 -831,7 +866,7 @@@
                        mw.config.set( 'wgDefaultDateFormat', 'mdy' );
  
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
  
@@@ -869,7 -842,7 +877,7 @@@
                currencySorted,
                function ( $table ) {
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
  
@@@ -883,9 -856,9 +891,9 @@@
                planets,
                planetsAscNameLegacy,
                function ( $table ) {
-                       $table.find( 'tr:last' ).addClass( 'sortbottom' );
+                       $table.find( 'tr' ).last().addClass( 'sortbottom' );
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
  
@@@ -900,7 -873,7 +908,7 @@@
                                '</table>'
                );
                $table.tablesorter();
-               $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+               $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
  
                assert.strictEqual(
                        $table.data( 'tablesorter' ).config.parsers[ 0 ].id,
@@@ -945,7 -918,7 +953,7 @@@
                                '<tr><td data-sort-value="Cherry">Dolphin</td></tr>' +
                                '</tbody></table>'
                );
-               $table.tablesorter().find( '.headerSort:eq(0)' ).trigger( 'click' );
+               $table.tablesorter().find( '.headerSort' ).eq( 0 ).trigger( 'click' );
  
                data = [];
                $table.find( 'tbody > tr' ).each( function ( i, tr ) {
@@@ -992,7 -965,7 +1000,7 @@@
                                '<tr><td><span data-sort-value="D">H</span></td></tr>' +
                                '</tbody></table>'
                );
-               $table.tablesorter().find( '.headerSort:eq(0)' ).trigger( 'click' );
+               $table.tablesorter().find( '.headerSort' ).eq( 0 ).trigger( 'click' );
  
                data = [];
                $table.find( 'tbody > tr' ).each( function ( i, tr ) {
@@@ -1044,9 -1017,7 +1052,7 @@@
                                '</tbody></table>'
                );
                // initialize table sorter and sort once
-               $table
-                       .tablesorter()
-                       .find( '.headerSort:eq(0)' ).trigger( 'click' );
+               $table.tablesorter().find( '.headerSort' ).eq( 0 ).trigger( 'click' );
  
                // Change the sortValue data properties (T40152)
                // - change data
@@@ -1057,8 -1028,8 +1063,8 @@@
                $table.find( 'td:contains(G)' ).removeData( 'sortValue' );
  
                // Now sort again (twice, so it is back at Ascending)
-               $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
-               $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+               $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
+               $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
  
                data = [];
                $table.find( 'tbody > tr' ).each( function ( i, tr ) {
@@@ -1099,7 -1070,7 +1105,7 @@@
                [ 'Numbers' ], numbers, numbersAsc,
                function ( $table ) {
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
  
@@@ -1107,7 -1078,7 +1113,7 @@@
                [ 'Numbers' ], numbers, reversed( numbersAsc ),
                function ( $table ) {
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' ).trigger( 'click' );
                }
        );
        // TODO add numbers sorting tests for T10115 with a different language
@@@ -1126,7 -1097,7 +1132,7 @@@
                $table.tablesorter();
  
                assert.strictEqual(
-                       $table.find( '> thead:eq(0) > tr > th.headerSort' ).length,
+                       $table.find( '> thead > tr > th.headerSort' ).length,
                        1,
                        'Child tables inside a headercell should not interfere with sortable headers (T34888)'
                );
@@@ -1146,7 -1117,7 +1152,7 @@@
                        mw.config.set( 'wgDefaultDateFormat', 'mdy' );
  
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
  
@@@ -1159,7 -1130,7 +1165,7 @@@
                        mw.config.set( 'wgDefaultDateFormat', 'dmy' );
  
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
  
@@@ -1172,7 -1143,7 +1178,7 @@@
                        mw.config.set( 'wgDefaultDateFormat', 'dmy' );
  
                        $table.tablesorter();
-                       $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+                       $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                }
        );
  
@@@ -1184,7 -1155,7 +1190,7 @@@
                                '<tr><td>1</td></tr>' +
                                '</table>'
                );
-               $table.tablesorter().find( '.headerSort:eq(0)' ).trigger( 'click' );
+               $table.tablesorter().find( '.headerSort' ).eq( 0 ).trigger( 'click' );
  
                assert.strictEqual(
                        $table.find( 'td' ).first().text(),
@@@ -1205,7 -1176,7 +1211,7 @@@
                                '<tr><td><img alt="A" />C</tr>' +
                                '</table>'
                );
-               $table.tablesorter().find( '.headerSort:eq(0)' ).trigger( 'click' );
+               $table.tablesorter().find( '.headerSort' ).eq( 0 ).trigger( 'click' );
  
                assert.strictEqual(
                        $table.find( 'td' ).text(),
@@@ -1224,7 -1195,7 +1230,7 @@@
                                '<tr><td>4</td></tr>' +
                                '</table>'
                );
-               $table.tablesorter().find( '.headerSort:eq(0)' ).trigger( 'click' );
+               $table.tablesorter().find( '.headerSort' ).eq( 0 ).trigger( 'click' );
  
                assert.strictEqual(
                        $table.find( 'td' ).text(),
@@@ -1358,7 -1329,7 +1364,7 @@@
                                '</tbody></table>' );
  
                        $table.tablesorter();
-                       assert.strictEqual( $table.find( 'tr:eq(1) th:eq(1)' ).data( 'headerIndex' ),
+                       assert.strictEqual( $table.find( 'tr' ).eq( 1 ).find( 'th' ).eq( 1 ).data( 'headerIndex' ),
                                2,
                                'Incorrect index of sort header'
                        );
@@@ -1475,9 -1446,9 +1481,9 @@@
                                '</table>'
                );
                $table.tablesorter();
-               $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+               $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
                // now the first row have 2 columns
-               $table.find( '.headerSort:eq(1)' ).trigger( 'click' );
+               $table.find( '.headerSort' ).eq( 1 ).trigger( 'click' );
  
                parsers = $table.data( 'tablesorter' ).config.parsers;
  
@@@ -1494,7 -1465,7 +1500,7 @@@
                );
  
                assert.strictEqual(
-                       parsers[ 1 ].format( $table.find( 'tbody > tr > td:eq(1)' ).text() ),
+                       parsers[ 1 ].format( $table.find( 'tbody > tr > td' ).eq( 1 ).text() ),
                        -Infinity,
                        'empty cell is sorted as number -Infinity'
                );
@@@ -1513,7 -1484,7 +1519,7 @@@
                                '</table>'
                );
                $table.tablesorter();
-               $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+               $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
  
                assert.deepEqual(
                        tableExtract( $table ),
@@@ -1544,7 -1515,7 +1550,7 @@@
                                '</table>'
                );
                $table.tablesorter();
-               $table.find( '.headerSort:eq(0)' ).trigger( 'click' );
+               $table.find( '.headerSort' ).eq( 0 ).trigger( 'click' );
  
                assert.deepEqual(
                        tableExtract( $table ),