ensured uri is scoped in a few tests

[lhc/web/wiklou.git] / resources / jquery / jquery.tablesorter.js

diff --git a/resources/jquery/jquery.tablesorter.js b/resources/jquery/jquery.tablesorter.js
index 8150254..76ab215 100644 (file)
--- a/resources/jquery/jquery.tablesorter.js
+++ b/resources/jquery/jquery.tablesorter.js
@@ -442,7 +442,7 @@
 
        function explodeRowspans( $table ) {
                // Split multi row cells into multiple cells with the same content
-               $table.find( '[rowspan]' ).each(function() {
+               $table.find( 'tbody [rowspan]' ).each(function() {
                        var rowSpan = this.rowSpan;
                        this.rowSpan = 1;
                        var cell = $( this );
@@ -596,7 +596,12 @@
                                                        // and put the <tfoot> at the end of the <table>
                                                        var $sortbottoms = $table.find( 'tr.sortbottom' );
                                                        if ( $sortbottoms.length ) {
-                                                               $table.append( $( '<tfoot>' ).append( $sortbottoms ) )
+                                                               var $tfoot = $table.find( 'tfoot' );
+                                                               if( $tfoot ) {
+                                                                       $tfoot.eq(0).prepend( $sortbottoms );
+                                                               } else {
+                                                                       $table.append( $( '<tfoot>' ).append( $sortbottoms ) )
+                                                               }
                                                        }
 
                                                        explodeRowspans( $table );
@@ -663,6 +668,10 @@
                                                        };
                                                        return false;
                                                }
+                                       } )
+                                       // Allow links in headers to be clicked
+                                       .find( 'a' ).click( function( e ) {
+                                               e.stopPropagation();
                                        } );
 
                                } );