Changeset 5347

Timestamp:

10/22/09 03:54:35 (2 years ago)

Author:

PaulHarvey

Message:

Item2254: First attempt at making TMCE (without forced_root_block: false) and WysiwygPlugin play nice with each other

Location:

branches/scratch/pharvey

Files:

• TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm (modified) (1 diff)
• WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/TML2HTML.pm (modified) (2 diffs)
• WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm (modified) (2 diffs)
• WysiwygPlugin/test/unit/WysiwygPlugin/WysiwygPluginTests.pm (modified) (2 diffs)

branches/scratch/pharvey/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm

@@ -37 +37 @@
 dialog_type: "modal",
 extended_valid_elements : "li[type]",
-forced_root_block : false,
 setupcontent_callback : FoswikiTiny.setUpContent,
 urlconverter_callback : "FoswikiTiny.convertLink",

branches/scratch/pharvey/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/TML2HTML.pm

@@ -47 +47 @@
 my $TT2 = chr(2);
 
+# SMELL: Item2254: Accomodates a temporary work-around, where TML2HTML
+#        needs to wrap content in <div></div>
+my $Item2254start = '<div>';
+my $Item2254end = '</div>';
+
 # HTML elements that are palatable to editors. Other HTML tags will be
 # rendered in 'protected' regions to prevent the WYSIWYG editor mussing
@@ -129 +134 @@
 
     # This should really use a template, but what the heck...
-    return $content;
+    # SMELL: Item2254 - see var declaration up top
+    return $Item2254start . $content . $Item2254end;
+
+    #return $content;
 }
 

branches/scratch/pharvey/WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm

@@ -41 +41 @@
 my $CANNOTWYSIWYG = 1 << 3;    # test that notWysiwygEditable returns true
                                #   and make the ROUNDTRIP test expect failure
+
+# SMELL: Accomodates the temporary work-around for Item2254, for when TML2HTML
+#        is wrapping content in <div></div>
+my $Item2254start = '<div>';
+my $Item2254end = '</div>';
 
 # Note: ROUNDTRIP is *not* the same as the combination of
@@ -2161 +2166 @@
         $this->TML_HTMLconverterOptions()
     );
+    
+    # SMELL: Item2254 temporary work-around requires TML2HTML to wrap output
+    # in <div></div>.
+    if (($Item2254start) and ($Item2254end)) {
+      $tx = ($tx =~ /^$Item2254start(.*)$Item2254end$/mxs)[0];
+    }
 
     $this->assert_html_equals( $html, $tx );

branches/scratch/pharvey/WysiwygPlugin/test/unit/WysiwygPlugin/WysiwygPluginTests.pm

@@ -31 +31 @@
 my $UI_FN;
 
+# SMELL: Accomodates the temporary work-around for Item2254, for when TML2HTML
+#        is wrapping content in <div></div>
+my $Item2254start = '<div>';
+my $Item2254end = '</div>';
+
 sub new {
     my $self = shift()->SUPER::new(@_);
@@ -164 +169 @@
 
     $out = Encode::decode_utf8($out);
-
+    
     my $id = "<!--$Foswiki::Plugins::WysiwygPlugin::SECRET_ID-->";
-    $this->assert( $out =~ s/^\s*$id<p>\s*//s, anal($out) );
-    $out =~ s/\s*<\/p>\s*$//s;
+    $this->assert( $out =~ s/^\s*$id$Item2254start<p>\s*//s, anal($out) );
+    $out =~ s/\s*<\/p>$Item2254end\s*$//s;
 
     require Foswiki::Plugins::WysiwygPlugin::Constants;