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

Timestamp:

11/28/08 15:12:15 (3 years ago)

Author:

CrawfordCurrie

Message:

Item6041: fix empty bullet list Item324: get it working on Foswiki Item295: further detoxing

File:

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

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

@@ -43 +43 @@
 use vars qw( $reww );
 
-require Foswiki::Plugins::WysiwygPlugin::Constants;
-require Foswiki::Plugins::WysiwygPlugin::HTML2TML::WC;
+use Foswiki::Plugins::WysiwygPlugin::Constants;
+use Foswiki::Plugins::WysiwygPlugin::HTML2TML::WC;
 
 =pod
@@ -617 +617 @@
         my $t;
         my $grandkid = $kid->{head};
-        # IE generates spurious empty divs inside LIs. Detect and skip
-        # them.
-        if( $grandkid->{tag} =~ /^div$/i
-              && $grandkid == $kid->{tail}
-                && scalar(keys %{$this->{attrs}}) == 0 ) {
-            $grandkid = $grandkid->{head};
-        }
-        while ($grandkid) {
-            if( $grandkid->{tag} =~ /^[dou]l$/i ) {
-                #$spawn = _trim( $spawn );
-                $t = $grandkid->_convertList( $indent.$WC::TAB );
-            } else {
-                ( $f, $t ) = $grandkid->generate( $WC::NO_BLOCK_TML );
-                $t =~ s/$WC::CHECKn/ /g;
-                # Item5257: If this is the last child of the LI, trim
-                # trailing spaces. Otherwise spaces generated by the
-                # editor before the </li> will be appended to the line.
-                # It is safe to remove them, as TML never depends on
-                # these spaces. If there are any intentional spaces at
-                # the end of protected content, these will have been
-                # converted to &nbsp; and protected that way.
-                $t =~ s/\s+$// unless $grandkid->{next};
-            }
-            $spawn .= $t;
-            $grandkid = $grandkid->{next};
+        if ($grandkid) {
+            # IE generates spurious empty divs inside LIs. Detect and skip
+            # them.
+            if( $grandkid->{tag} && $grandkid->{tag} =~ /^div$/i
+                  && $grandkid == $kid->{tail}
+                    && scalar(keys %{$this->{attrs}}) == 0 ) {
+                $grandkid = $grandkid->{head};
+            }
+            while ($grandkid) {
+                if( $grandkid->{tag} && $grandkid->{tag} =~ /^[dou]l$/i ) {
+                    #$spawn = _trim( $spawn );
+                    $t = $grandkid->_convertList( $indent.$WC::TAB );
+                } else {
+                    ( $f, $t ) = $grandkid->generate( $WC::NO_BLOCK_TML );
+                    $t =~ s/$WC::CHECKn/ /g;
+                    # Item5257: If this is the last child of the LI, trim
+                    # trailing spaces. Otherwise spaces generated by the
+                    # editor before the </li> will be appended to the line.
+                    # It is safe to remove them, as TML never depends on
+                    # these spaces. If there are any intentional spaces at
+                    # the end of protected content, these will have been
+                    # converted to &nbsp; and protected that way.
+                    $t =~ s/\s+$// unless $grandkid->{next};
+                }
+                $spawn .= $t;
+                $grandkid = $grandkid->{next};
+            }
         }
         #$spawn = _trim($spawn);