http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90678
Revision: 90678
Author: hartman
Date: 2011-06-23 21:26:21 +0000 (Thu, 23 Jun 2011)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/phase3/resources/jquery/jquery.tablesorter.js
trunk/phase3/resources/mediawiki.page/mediawiki.page.ready.js
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
Modified: trunk/phase3/resources/jquery/jquery.tablesorter.js
===================================================================
--- trunk/phase3/resources/jquery/jquery.tablesorter.js 2011-06-23 20:58:46 UTC
(rev 90677)
+++ trunk/phase3/resources/jquery/jquery.tablesorter.js 2011-06-23 21:26:21 UTC
(rev 90678)
@@ -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] );
Modified: trunk/phase3/resources/mediawiki.page/mediawiki.page.ready.js
===================================================================
--- trunk/phase3/resources/mediawiki.page/mediawiki.page.ready.js
2011-06-23 20:58:46 UTC (rev 90677)
+++ trunk/phase3/resources/mediawiki.page/mediawiki.page.ready.js
2011-06-23 21:26:21 UTC (rev 90678)
@@ -9,9 +9,9 @@
$( '.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();
});
}
Modified:
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
===================================================================
--- trunk/phase3/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
2011-06-23 20:58:46 UTC (rev 90677)
+++ trunk/phase3/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
2011-06-23 21:26:21 UTC (rev 90678)
@@ -21,7 +21,7 @@
* @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>');
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
