| Index: branches/wmf/1.18wmf1/resources/jquery/jquery.tablesorter.js |
| — | — | @@ -229,7 +229,7 @@ |
| 230 | 230 | * @param $table jQuery object for a <table> |
| 231 | 231 | */ |
| 232 | 232 | function emulateTHeadAndFoot( $table ) { |
| 233 | | - var $rows = $table.find( 'tr' ); |
| | 233 | + var $rows = $table.find( '> tbody > tr' ); |
| 234 | 234 | if( !$table.get(0).tHead ) { |
| 235 | 235 | var $thead = $( '<thead>' ); |
| 236 | 236 | $rows.each( function() { |
| — | — | @@ -269,7 +269,7 @@ |
| 270 | 270 | }); |
| 271 | 271 | $tableHeaders = $( longest ); |
| 272 | 272 | } |
| 273 | | - $tableHeaders = $tableHeaders.find( 'th' ).each( function( index ) { |
| | 273 | + $tableHeaders = $tableHeaders.children( 'th' ).each( function( index ) { |
| 274 | 274 | this.column = realCellIndex; |
| 275 | 275 | |
| 276 | 276 | var colspan = this.colspan; |
| — | — | @@ -441,13 +441,13 @@ |
| 442 | 442 | |
| 443 | 443 | function explodeRowspans( $table ) { |
| 444 | 444 | // Split multi row cells into multiple cells with the same content |
| 445 | | - $table.find( 'tbody [rowspan]' ).each(function() { |
| | 445 | + $table.find( '> tbody > tr > [rowspan]' ).each(function() { |
| 446 | 446 | var rowSpan = this.rowSpan; |
| 447 | 447 | this.rowSpan = 1; |
| 448 | 448 | var cell = $( this ); |
| 449 | 449 | var next = cell.parent().nextAll(); |
| 450 | 450 | for ( var i = 0; i < rowSpan - 1; i++ ) { |
| 451 | | - var td = next.eq( i ).find( 'td' ); |
| | 451 | + var td = next.eq( i ).children( 'td' ); |
| 452 | 452 | if ( !td.length ) { |
| 453 | 453 | next.eq( i ).append( cell.clone() ); |
| 454 | 454 | } else if ( this.cellIndex === 0 ) { |
| — | — | @@ -598,10 +598,10 @@ |
| 599 | 599 | // Legacy fix of .sortbottoms |
| 600 | 600 | // Wrap them inside inside a tfoot (because that's what they actually want to be) & |
| 601 | 601 | // and put the <tfoot> at the end of the <table> |
| 602 | | - var $sortbottoms = $table.find( 'tr.sortbottom' ); |
| | 602 | + var $sortbottoms = $table.find( '> tbody > tr.sortbottom' ); |
| 603 | 603 | if ( $sortbottoms.length ) { |
| 604 | | - var $tfoot = $table.find( 'tfoot' ); |
| 605 | | - if( $tfoot.length ) { |
| | 604 | + var $tfoot = $table.children( 'tfoot' ); |
| | 605 | + if ( $tfoot.length ) { |
| 606 | 606 | $tfoot.eq(0).prepend( $sortbottoms ); |
| 607 | 607 | } else { |
| 608 | 608 | $table.append( $( '<tfoot>' ).append( $sortbottoms ) ) |
| Index: branches/wmf/1.18wmf1/skins/monobook/main.css |
| — | — | @@ -572,15 +572,6 @@ |
| 573 | 573 | width: 11.6em; |
| 574 | 574 | overflow: hidden; |
| 575 | 575 | } |
| 576 | | -html > body .portlet { |
| 577 | | - float: left; |
| 578 | | - clear: left; |
| 579 | | -} |
| 580 | | -/* recover IEMac (might be fine with the float, but usually it's close to IE */ |
| 581 | | -*>body .portlet { |
| 582 | | - float: none; |
| 583 | | - clear: none; |
| 584 | | -} |
| 585 | 576 | .portlet h4 { |
| 586 | 577 | font-size: 95%; |
| 587 | 578 | font-weight: normal; |
| Property changes on: branches/wmf/1.18wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 588 | 579 | Merged /trunk/phase3:r101417,101420,101540 |