Merge "fix backup unit 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 0030b4c..ea86b64 100644 (file)
--- a/resources/jquery/jquery.tablesorter.js
+++ b/resources/jquery/jquery.tablesorter.js
@@ -224,26 +224,43 @@
         * This only treats a row as a header row if it contains only <th>s (no <td>s)
         * and if it is preceded entirely by header rows. The algorithm stops when
         * it encounters the first non-header row.
+        * 
+        * After this, it will look at all rows at the bottom for footer rows
+        * And place these in a tfoot using similar rules.
         * @param $table jQuery object for a <table>
         */ 
-       function emulateTHead( $table ) {
-               var $thead = $( '<thead>' );
-               $table.find( 'tr' ).each( function() {
-                       if ( $(this).children( 'td' ).length > 0 ) {
-                               // This row contains a <td>, so it's not a header row
-                               // Stop here
-                               return false;
-                       }
-                       $thead.append( this );
-               } );
-               $table.prepend( $thead );
+       function emulateTHeadAndFoot( $table ) {
+               var $rows = $table.find( '> tbody > tr' );
+               if( !$table.get(0).tHead ) {
+                       var $thead = $( '<thead>' );
+                       $rows.each( function() {
+                               if ( $(this).children( 'td' ).length > 0 ) {
+                                       // This row contains a <td>, so it's not a header row
+                                       // Stop here
+                                       return false;
+                               }
+                               $thead.append( this );
+                       } );
+                       $table.find(' > tbody:first').before( $thead );
+               }
+               if( !$table.get(0).tFoot ) {
+                       var $tfoot = $( '<tfoot>' );
+                       var len = $rows.length;
+                       for ( var i = len-1; i >= 0; i-- ) {
+                               if( $( $rows[i] ).children( 'td' ).length > 0 ){
+                                       break;
+                               }
+                               $tfoot.prepend( $( $rows[i] ));
+                       } 
+                       $table.append( $tfoot );
+               }
        }
 
        function buildHeaders( table, msg ) {
                var     maxSeen = 0,
                        longest,
                        realCellIndex = 0,
-                       $tableHeaders = $( 'thead:eq(0) tr', table );
+                       $tableHeaders = $( 'thead:eq(0) > tr', table );
                if ( $tableHeaders.length > 1 ) {
                        $tableHeaders.each( function() {
                                if ( this.cells.length > maxSeen ) {
@@ -253,7 +270,7 @@
                        });
                        $tableHeaders = $( longest );
                }
-               $tableHeaders = $tableHeaders.find( 'th' ).each( function( index ) {
+               $tableHeaders = $tableHeaders.children( 'th' ).each( function( index ) {
                        this.column = realCellIndex;
 
                        var colspan = this.colspan;
@@ -425,13 +442,13 @@
 
        function explodeRowspans( $table ) {
                // Split multi row cells into multiple cells with the same content
-               $table.find( '[rowspan]' ).each(function() {
+               $table.find( '> tbody > tr > [rowspan]' ).each(function() {
                        var rowSpan = this.rowSpan;
                        this.rowSpan = 1;
                        var cell = $( this );
                        var next = cell.parent().nextAll();
                        for ( var i = 0; i < rowSpan - 1; i++ ) {
-                               var td = next.eq( i ).find( 'td' );
+                               var td = next.eq( i ).children( 'td' );
                                if ( !td.length ) {
                                        next.eq( i ).append( cell.clone() );
                                } else if ( this.cellIndex === 0 ) {
@@ -532,8 +549,8 @@
                                        }
                                        if ( !table.tHead ) {
                                                // No thead found. Look for rows with <th>s and
-                                               // move them into a <thead> tag
-                                               emulateTHead( $table );
+                                               // move them into a <thead> tag or a <tfoot> tag
+                                               emulateTHeadAndFoot( $table );
                                                
                                                // Still no thead? Then quit
                                                if ( !table.tHead ) {
@@ -568,8 +585,13 @@
                                        cacheRegexs();
 
                                        // Apply event handling to headers
-                                       // this is to big, perhaps break it out?
+                                       // this is too big, perhaps break it out?
                                        $headers.click( function( e ) {
+                                               if ( e.target.nodeName.toLowerCase() == 'a' ) {
+                                                       // The user clicked on a link inside a table header
+                                                       // Do nothing and let the default link click action continue
+                                                       return true;
+                                               }
 
                                                if ( firstTime ) {
                                                        firstTime = false;
@@ -577,9 +599,14 @@
                                                        // Legacy fix of .sortbottoms
                                                        // Wrap them inside inside a tfoot (because that's what they actually want to be) &
                                                        // and put the <tfoot> at the end of the <table>
-                                                       var $sortbottoms = $table.find( 'tr.sortbottom' );
+                                                       var $sortbottoms = $table.find( '> tbody > tr.sortbottom' );
                                                        if ( $sortbottoms.length ) {
-                                                               $table.append( $( '<tfoot>' ).append( $sortbottoms ) )
+                                                               var $tfoot = $table.children( 'tfoot' );
+                                                               if ( $tfoot.length ) {
+                                                                       $tfoot.eq(0).prepend( $sortbottoms );
+                                                               } else {
+                                                                       $table.append( $( '<tfoot>' ).append( $sortbottoms ) );
+                                                               }
                                                        }
 
                                                        explodeRowspans( $table );
@@ -647,7 +674,6 @@
                                                        return false;
                                                }
                                        } );
-
                                } );
                        },