From 6f225a6c16692e6e287b2c4fe8439038d0eb220d Mon Sep 17 00:00:00 2001
From: Derk-Jan Hartman <hartman@users.mediawiki.org>
Date: Thu, 23 Jun 2011 21:26:21 +0000
Subject: [PATCH] Switch jquery.sortable to use mw-sortable and mw-unsortable
 classes, to be in line with makeCollapsible. Support for legacy .sortable
 remains. Follow up to r86088

---
 resources/jquery/jquery.tablesorter.js                        | 2 +-
 resources/mediawiki.page/mediawiki.page.ready.js              | 4 ++--
 .../qunit/suites/resources/jquery/jquery.tablesorter.test.js  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/jquery/jquery.tablesorter.js b/resources/jquery/jquery.tablesorter.js
index 3f8c28c47f..03016fdedd 100644
--- 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 c9f4ad4077..319f8cd208 100644
--- 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 5fadadebe8..26e963d225 100644
--- 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>');
-- 
2.20.1