Switch jquery.sortable to use mw-sortable and mw-unsortable classes, to be in line...

Follow up to r86088

diff --git a/resources/jquery/jquery.tablesorter.js b/resources/jquery/jquery.tablesorter.js
index 3f8c28c..03016fd 100644 (file)
--- a/resources/jquery/jquery.tablesorter.js
+++ b/resources/jquery/jquery.tablesorter.js
@@ -287,7 +287,7 @@
                                        this.order = 0;
                                        this.count = 0;
 
-                                       if ( $( this ).is( '.unsortable' ) ) this.sortDisabled = true;
+                                       if ( $( this ).is( '.unsortable, .mw-unsortable' ) ) this.sortDisabled = true;
 
                                        if ( !this.sortDisabled ) {
                                                var $th = $( this ).addClass( table.config.cssHeader ).attr( 'title', msg[1] );

diff --git a/resources/mediawiki.page/mediawiki.page.ready.js b/resources/mediawiki.page/mediawiki.page.ready.js
index c9f4ad4..319f8cd 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.sortable' ).length ) {
+       if ( $( 'table.mw-sortable, table.sortable' ).length ) {
                mw.loader.using( 'jquery.tablesorter', function() {
-                       $( 'table.sortable' ).tablesorter();
+                       $( 'table.mw-sortable, 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 5fadade..26e963d 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="sortable"><thead></thead><tbody></tbody></table>'),
+       var $table = $('<table class="mw-sortable"><thead></thead><tbody></tbody></table>'),
                $thead = $table.find('thead'),
                $tbody = $table.find('tbody');
        var $tr = $('<tr>');