Changeset 3900 for branches/Release01x00/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML.pm

Timestamp:

05/13/09 20:16:40 (3 years ago)

Author:

MichaelTempest

Message:

Item1535, Item1397: Merge changes from trunk to release branch

File:

• branches/Release01x00/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML.pm (modified) (2 diffs)

branches/Release01x00/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML.pm

@@ -66 +66 @@
 
     my $this = new HTML::Parser(
-        start_h       => [ \&_openTag,  'self,tagname,attr' ],
-        end_h         => [ \&_closeTag, 'self,tagname' ],
-        declaration_h => [ \&_ignore,   'self' ],
-        default_h     => [ \&_text,     'self,text' ],
-        comment_h     => [ \&_comment,  'self,text' ]
+        start_h          => [ \&_openTag,  'self,tagname,attr' ],
+        end_h            => [ \&_closeTag, 'self,tagname' ],
+        text_h           => [ \&_text,     'self,text' ],
+        comment_h        => [ \&_comment,  'self,text' ],
+        declaration_h    => [ \&_ignore,   'self' ],
+        start_document_h => [ \&_ignore,   'self' ],
+        end_document_h   => [ \&_ignore,   'self' ],
+        default_h        => [ \&_default,  'self,event,text' ]
     );
 
@@ -220 +223 @@
 }
 
+sub _default {
+        my ( $this, $event, $text ) = @_;
+    # Unexpected $event event from HTML::Parser; text contains '$text'
+        ASSERT(0);
+}
+
 sub _apply {
     my ( $this, $tag ) = @_;