Changeset 4292

Timestamp:

06/24/09 19:37:44 (3 years ago)

Author:

MichaelTempest

Message:

Item1770: Protect the XML-like tags themselves, and not just the content within the tags
Call the callback function passed to adXMLTag
Add first unit tests for XML-like tag handling

Location:

trunk/WysiwygPlugin

Files:

• lib/Foswiki/Plugins/WysiwygPlugin/TML2HTML.pm (modified) (2 diffs)
• test/unit/WysiwygPlugin/ExtendedTranslatorTests.pm (added)
• test/unit/WysiwygPlugin/WysiwygPluginSuite.pm (modified) (1 diff)

trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/TML2HTML.pm

@@ -600 +600 @@
     my ( $this, $text ) = @_;
 
+    my $xmltags = $this->{opts}->{xmltag};
     # Take out custom XML tags
     sub _takeOutCustomXmlProcess {
         my ( $this, $state, $scoop ) = @_;
-        return $this->_liftOut( $scoop, 'PROTECTED' );
-    }
-    my $xmltags = $this->{opts}->{xmltag};
-    for my $tag ( sort keys %$xmltags ) {
+        my $params = $state->{tagParams};
+        my $tag = $state->{tag};
+        my $markup = "<$tag$params>$scoop</$tag>";
+        if ($this->{opts}->{xmltag}->{$tag}->($markup)) {
+            return $this->_liftOut( $markup, 'PROTECTED' );
+        }
+        else {
+            return $this->_liftOut( "<$tag$params>", 'PROTECTED' ) . $scoop . $this->_liftOut( "</$tag>", 'PROTECTED' );
+        }
+    }
+    for my $tag ( sort keys %{ $this->{opts}->{xmltag} } ) {
         $text = _takeOutXml( $this, $text, $tag, \&_takeOutCustomXmlProcess );
     }
@@ -646 +654 @@
 
     # &$fn may rely on the existence of these fields, 
-        # and may add more fields, if needed
+    # and may add more fields, if needed
     my %state = ( tag => $tag, n => 0, tagParams => undef );
 

trunk/WysiwygPlugin/test/unit/WysiwygPlugin/WysiwygPluginSuite.pm

@@ -26 +26 @@
 
 sub include_tests {
-    return qw(TranslatorTests WysiwygPluginTests);
+    return qw(TranslatorTests ExtendedTranslatorTests WysiwygPluginTests);
 }