Item13688: fixed css precedence for table css

- removed hard-coded vertical alignment - up'ed plugin version - some perl tidy
foswiki · Sep 9, 2015 · 4f23f56 · 4f23f56
1 parent 982bf89
commit 4f23f56
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/TablePlugin/data/System/TablePlugin.txt b/TablePlugin/data/System/TablePlugin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1426439233" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1441799782" format="1.1" version="1"}%
 %META:TOPICPARENT{name="Plugins"}%
 ---+ Table Plugin
 
@@ -193,6 +193,7 @@ Sort icons in the header are read from %SYSTEMWEB%.DocumentGraphics.
 
 %TABLE{columnwidths="10%,90%"}%
 |  Change History: | <!-- specify latest version first -->&nbsp; |
+|  09 Sep 2015 | 1.150: Foswikitask:Item13688 - fixed css precedence for table css emitted by !TablePlugin; removed hard-coded vertical alignment |
 |  28 May 2013 | 1.142: Foswikitask:Item12480 - memory leak amasses css styles from all visited pages |
 |  28 Nov 2012 | 1.141: Foswikitask:Item12233 - Don't generate table sort links when rendering static html. |
 |  06 Apr 2012 | 1.140: Arthur Clemens: Foswikitask:Item11354 adds warning message when =include= parameter fails. |

diff --git a/TablePlugin/lib/Foswiki/Plugins/TablePlugin.pm b/TablePlugin/lib/Foswiki/Plugins/TablePlugin.pm
@@ -19,8 +19,8 @@ BEGIN {
 }
 
 # Simple decimal version, use parse method, no leading "v"
-our $VERSION = '1.142';
-our $RELEASE = '1.142';
+our $VERSION = '1.150';
+our $RELEASE = '09 Sep 2015';
 our $SHORTDESCRIPTION =
   'Control attributes of tables and sorting of table columns';
 our $NO_PREFS_IN_TOPIC = 1;

diff --git a/TablePlugin/lib/Foswiki/Plugins/TablePlugin/Core.pm b/TablePlugin/lib/Foswiki/Plugins/TablePlugin/Core.pm
@@ -389,7 +389,7 @@ sub _parseAttributes {
     _storeAttribute( 'columnWidthsListRef',
         _arrayRefFromParam( $inParams->{columnwidths} ),
         $inCollection );
-    _storeAttribute( 'vAlign', $inParams->{valign} || 'top', $inCollection );
+    _storeAttribute( 'vAlign',       $inParams->{valign},       $inCollection );
     _storeAttribute( 'dataVAlign',   $inParams->{datavalign},   $inCollection );
     _storeAttribute( 'headerVAlign', $inParams->{headervalign}, $inCollection );
     _storeAttribute( 'headerBgSorted',
@@ -673,8 +673,8 @@ sub _processTableRow {
                     my $nRows = scalar(@curTable);
                     my $rspan = $rowspan[$col] + 1;
                     if ( $rspan > 1 ) {
-                        $curTable[ $nRows - $rspan ][$col]->{attrs}->{rowspan} =
-                          $rspan;
+                        $curTable[ $nRows - $rspan ][$col]->{attrs}->{rowspan}
+                          = $rspan;
                     }
                     undef( $rowspan[$col] );
                 }
@@ -1307,10 +1307,10 @@ sub _createCssStyles {
             $selector =~ s/xhover/hover/go;    # remove sorting hack
                  # TODO: optimize by combining identical rules
             if ( $selector eq '#' ) {
-                push @styles, "$tableSelector {$selectors}";
+                push @styles, "body $tableSelector {$selectors}";
             }
             else {
-                push @styles, "$tableSelector $selector {$selectors}";
+                push @styles, "body $tableSelector $selector {$selectors}";
             }
         }
     }