dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Localisation updates for core and extension messages from translatewiki.net
[lhc/web/wiklou.git]
/
resources
/
jquery
/
jquery.tablesorter.js
diff --git
a/resources/jquery/jquery.tablesorter.js
b/resources/jquery/jquery.tablesorter.js
index
f054aaa
..
f134aab
100644
(file)
--- a/
resources/jquery/jquery.tablesorter.js
+++ b/
resources/jquery/jquery.tablesorter.js
@@
-230,7
+230,7
@@
* @param $table jQuery object for a <table>
*/
function emulateTHeadAndFoot( $table ) {
* @param $table jQuery object for a <table>
*/
function emulateTHeadAndFoot( $table ) {
- var $rows = $table.find( 'tr' );
+ var $rows = $table.find( '
> tbody >
tr' );
if( !$table.get(0).tHead ) {
var $thead = $( '<thead>' );
$rows.each( function() {
if( !$table.get(0).tHead ) {
var $thead = $( '<thead>' );
$rows.each( function() {
@@
-241,7
+241,7
@@
}
$thead.append( this );
} );
}
$thead.append( this );
} );
- $table.
prepend
( $thead );
+ $table.
children('tbody').before
( $thead );
}
if( !$table.get(0).tFoot ) {
var $tfoot = $( '<tfoot>' );
}
if( !$table.get(0).tFoot ) {
var $tfoot = $( '<tfoot>' );
@@
-270,7
+270,7
@@
});
$tableHeaders = $( longest );
}
});
$tableHeaders = $( longest );
}
- $tableHeaders = $tableHeaders.
find
( 'th' ).each( function( index ) {
+ $tableHeaders = $tableHeaders.
children
( 'th' ).each( function( index ) {
this.column = realCellIndex;
var colspan = this.colspan;
this.column = realCellIndex;
var colspan = this.colspan;
@@
-442,13
+442,13
@@
function explodeRowspans( $table ) {
// Split multi row cells into multiple cells with the same content
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 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 ) {
if ( !td.length ) {
next.eq( i ).append( cell.clone() );
} else if ( this.cellIndex === 0 ) {
@@
-585,8
+585,13
@@
cacheRegexs();
// Apply event handling to headers
cacheRegexs();
// Apply event handling to headers
- // this is to big, perhaps break it out?
+ // this is to
o
big, perhaps break it out?
$headers.click( function( e ) {
$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;
if ( firstTime ) {
firstTime = false;
@@
-594,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>
// 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 ) {
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 );
}
explodeRowspans( $table );
@@
-663,12
+673,7
@@
};
return false;
}
};
return false;
}
- } )
- // Allow links in headers to be clicked
- .find( 'a' ).click( function( e ) {
- e.stopPropagation();
} );
} );
-
} );
},
} );
},