Changeset 5236

Timestamp:

10/08/09 20:15:50 (4 years ago)

Author:

MichaelTempest

Message:

Item1905: endRenderingHandler was never needed on Foswiki
startRenderingHandler will not be needed from 1.1 onwards
writeHeaderHandler was never part of Foswiki

File:

• trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin.pm (modified) (4 diffs)

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

@@ -35 +35 @@
 
 use vars qw( $html2tml $tml2html $recursionBlock $imgMap );
-use vars qw( %TWikiCompatibility @refs %xmltag %xmltagPlugin);
+use vars qw( %FoswikiCompatibility @refs %xmltag %xmltagPlugin);
 
 our $SHORTDESCRIPTION  = 'Translator framework for Wysiwyg editors';
@@ -106 +106 @@
 }
 
+$FoswikiCompatibility{startRenderingHandler} = 2.1;
 sub startRenderingHandler {
     $_[0] =~ s#</?sticky>##g;
@@ -299 +300 @@
 }
 
-# DEPRECATED in Dakar (postRenderingHandler does the job better)
-$TWikiCompatibility{endRenderingHandler} = 1.1;
-
-sub endRenderingHandler {
-    return postRenderingHandler(@_);
-}
-
-# Dakar handler, replaces endRenderingHandler above
 sub postRenderingHandler {
     return if ( $recursionBlock || !$tml2html );
@@ -314 +307 @@
 }
 
-# Commented out because of Bugs:Item1176
-# DEPRECATED in Dakar (modifyHeaderHandler does the job better)
-#$TWikiCompatibility{writeHeaderHandler} = 1.1;
-#sub writeHeaderHandler {
-#    my $query = shift;
-#    if( $query->param( 'wysiwyg_edit' )) {
-#        return "Expires: 0\nCache-control: max-age=0, must-revalidate";
-#    }
-#    return '';
-#}
-
-# Dakar modify headers.
 sub modifyHeaderHandler {
     my ( $headers, $query ) = @_;