From: <Cra...@nt...> - 2005-09-28 13:21:15
|
Author: CrawfordCurrie Date: 2005-09-28 06:20:46 -0700 (Wed, 28 Sep 2005) New Revision: 6647 Modified: twiki/branches/DEVELOP/twikiplugins/TablePlugin/lib/TWiki/Plugins/TablePlugin/Core.pm Log: Item519: sort=of wasn't working Modified: twiki/branches/DEVELOP/twikiplugins/TablePlugin/lib/TWiki/Plugins/TablePlugin/Core.pm =================================================================== --- twiki/branches/DEVELOP/twikiplugins/TablePlugin/lib/TWiki/Plugins/TablePlugin/Core.pm 2005-09-28 13:07:12 UTC (rev 6646) +++ twiki/branches/DEVELOP/twikiplugins/TablePlugin/lib/TWiki/Plugins/TablePlugin/Core.pm 2005-09-28 13:20:46 UTC (rev 6647) @@ -282,18 +282,14 @@ return $sortAttachments; } - my $sortThisTable = $sortAllTables; - if( $sortAllTables ) { - # All cells in header are headings? - foreach my $cell ( @$header ) { - if( $cell->{type} ne 'th' ) { - $sortThisTable = 0; - last; - } - } + return 0 unless $sortAllTables; + + # All cells in header are headings? + foreach my $cell ( @$header ) { + return 0 if( $cell->{type} ne 'th' ); } - return $sortThisTable; + return 1; } # Guess if column is a date, number or plain text @@ -591,8 +587,6 @@ my @lines = split( /\r?\n/, $_[0] ); for ( @lines ) { if( s/%TABLE(?:{(.*?)})?%/_parseParameters($1)/se ) { - # %TABLE tables are always sortable - $sortAllTables = 1; $acceptable = 1; } elsif( $acceptable && |