Changeset 3875 for trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML/Node.pm

Timestamp:

05/10/09 16:02:03 (3 years ago)

Author:

MichaelTempest

Message:

Item1535: Inserted span elements when WYSIWYG_TT class is applied to other elements. Added unit tests to replicate fault.

Also updated the internal test documentation in TranslatorTest.pm. (CDot: Thanks for explaining things)

Added explicit event handlers for each type of event generated by HTML::Parser, to eliminate the empty text elements generated from the start_document and end_document events. The default event handler should never be called, now.

File:

• trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML/Node.pm (modified) (5 diffs)

trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML/Node.pm

@@ -363 +363 @@
 
 # Collapse adjacent VERBATIM nodes together
-# Collapse a <p> than contains only a protected span into a protected P
+# Collapse a <p> that contains only a protected span into a protected P
 # Collapse em in em
 # Collapse adjacent text nodes
@@ -444 +444 @@
 }
 
+# If this node has the specified class, insert a new "span" node with that
+# class between this node and all of this node's children.
+sub _moveClassToSpan
+{
+    my $this = shift;
+    my $class = shift;
+
+    if ( $this->{tag} and 
+         lc($this->{tag}) ne 'span' and
+         $this->_removeClass($class) ) {
+         
+        my $newspan = new Foswiki::Plugins::WysiwygPlugin::HTML2TML::Node( $this->{context}, 'span', { class => $class } );
+        my $kid = $this->{head};
+        while ($kid) {
+            $newspan->addChild($kid);
+            $kid = $kid->{next};
+        }
+        $this->{head} = $this->{tail} = $newspan;
+    }
+}
+
 # the actual generate function. rootGenerate is only applied to the root node.
 sub generate {
@@ -487 +508 @@
     $tag =~ s/!//;    # DOCTYPE
     my $tmlFn = '_handle' . uc($tag);
+
+    $this->_moveClassToSpan('WYSIWYG_TT');
 
     # See if we have a TML translation function for this tag
@@ -839 +862 @@
     while ($kid) {
         if ( $kid->{tag} eq 'th' ) {
+            $kid->_moveClassToSpan('WYSIWYG_TT');
             ( $flags, $text ) = $kid->_flatten($options);
             $text = _TDtrim($text);
@@ -844 +868 @@
         }
         elsif ( $kid->{tag} eq 'td' ) {
+            $kid->_moveClassToSpan('WYSIWYG_TT');
             ( $flags, $text ) = $kid->_flatten($options);
             $text = _TDtrim($text);