Revert r90678 per CR

diff --git a/resources/jquery/jquery.tablesorter.js b/resources/jquery/jquery.tablesorter.js
index 14c6b0a..59a28ac 100644 (file)
--- a/resources/jquery/jquery.tablesorter.js
+++ b/resources/jquery/jquery.tablesorter.js
@@ -240,7 +240,7 @@
                        this.order = 0;
                        this.count = 0;
 
-                       if ( $( this ).is( '.unsortable, .mw-unsortable' ) ) {
+                       if ( $( this ).is( '.unsortable' ) ) {
                                this.sortDisabled = true;
                        }
 

diff --git a/resources/mediawiki.page/mediawiki.page.ready.js b/resources/mediawiki.page/mediawiki.page.ready.js
index 319f8cd..c9f4ad4 100644 (file)
--- a/resources/mediawiki.page/mediawiki.page.ready.js
+++ b/resources/mediawiki.page/mediawiki.page.ready.js
@@ -9,9 +9,9 @@ jQuery( document ).ready( function( $ ) {
        $( '.mw-collapsible' ).makeCollapsible();
 
        /* Lazy load jquery.tablesorter */
-       if ( $( 'table.mw-sortable, table.sortable' ).length ) {
+       if ( $( 'table.sortable' ).length ) {
                mw.loader.using( 'jquery.tablesorter', function() {
-                       $( 'table.mw-sortable, table.sortable' ).tablesorter();
+                       $( 'table.sortable' ).tablesorter();
                });
        }
 

diff --git a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
index d71a526..b798432 100644 (file)
--- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
@@ -21,7 +21,7 @@ test( '-- Initial check', function() {
  * @return jQuery
  */
 var tableCreate = function( header, data ) {
-       var $table = $('<table class="mw-sortable"><thead></thead><tbody></tbody></table>'),
+       var $table = $('<table class="sortable"><thead></thead><tbody></tbody></table>'),
                $thead = $table.find('thead'),
                $tbody = $table.find('tbody');
        var $tr = $('<tr>');