http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90657
Revision: 90657
Author: diebuche
Date: 2011-06-23 08:31:00 +0000 (Thu, 23 Jun 2011)
Log Message:
-----------
Adding rowspan tests to tablesorting & make it more stable
Modified Paths:
--------------
trunk/phase3/resources/jquery/jquery.tablesorter.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 08:27:35 UTC
(rev 90656)
+++ trunk/phase3/resources/jquery/jquery.tablesorter.js 2011-06-23 08:31:00 UTC
(rev 90657)
@@ -463,7 +463,14 @@
var cell = $( this );
var next = cell.parent().nextAll();
for ( var i = 0; i < rowSpan - 1; i++ )
{
- next.eq(0).find( 'td' ).eq(
this.cellIndex ).before( cell.clone() );
+ var td = next.eq( i ).find(
'td' );
+ if ( !td.length ) {
+ next.eq( i ).append(
cell.clone() );
+ } else if ( this.cellIndex == 0
) {
+ td.eq( this.cellIndex
).before( cell.clone() );
+ } else {
+ td.eq( this.cellIndex -
1 ).after( cell.clone() );
+ }
}
});
}
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 08:27:35 UTC (rev 90656)
+++ trunk/phase3/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
2011-06-23 08:31:00 UTC (rev 90657)
@@ -292,7 +292,21 @@
}
);
+var planetsRowspan =[["Earth","6051.8"], jupiter, ["Mars","6051.8"], mercury,
saturn, venus];
+tableTest(
+ 'Basic planet table: Same value for multiple rows via rowspan',
+ header,
+ planets,
+ planetsRowspan,
+ function( $table ) {
+ //Quick&Dirty mod
+ $table.find('tr:eq(3) td:eq(1), tr:eq(4) td:eq(1)').remove();
+ $table.find('tr:eq(2) td:eq(1)').attr('rowspan', '3');
+ $table.tablesorter();
+ $table.find('.headerSort:eq(0)').click();
+ }
+);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
