Adding rowspan tests to tablesorting & make it more stable

diff --git a/resources/jquery/jquery.tablesorter.js b/resources/jquery/jquery.tablesorter.js
index 808cf6b..75c2520 100644 (file)
--- a/resources/jquery/jquery.tablesorter.js
+++ b/resources/jquery/jquery.tablesorter.js
@@ -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() );
+                                               }
                                        }
                                });
                        }

diff --git a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
index e9c075b..e96898c 100644 (file)
--- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
@@ -292,7 +292,21 @@ tableTest(
        }
 );
 
+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();
+       }
+);