Changeset 7679

Timestamp:

06/07/10 19:39:12 (2 years ago)

Author:

MichaelTempest

Message:

Item8294: Revert to using a <meta> tag, in accordance with Michael Daum's latest guidance, and back in line with how the code used to be before I tried EXPORTEDPREFERENCES.

File:

• trunk/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm (modified) (2 diffs)

trunk/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm

@@ -214 +214 @@
     my $tmceURL   = $pluginURL . '/tinymce/jscripts/tiny_mce';
 
-    # expand and URL-encode the init string
+    # expand the init string
     my $metainit = Foswiki::Func::expandCommonVariables($init);
+
+    # URL-encode the init string
     $metainit =~ s/([^0-9a-zA-Z-_.:~!*'\/%])/'%'.sprintf('%02x',ord($1))/ge;
 
-    my $exportedPrefs = Foswiki::Func::getPreferencesValue('EXPORTEDPREFERENCES')||'';
-    if ($exportedPrefs) {
-        # Send the encoded JSON to foswiki_tiny.js via an exported preference
-        Foswiki::Func::setPreferencesValue( 'TINYMCEPLUGIN_INIT_ENCODED', $metainit);
-        my @list = split(/[,\s]+/, $exportedPrefs);
-        unless (grep { /^TINYMCEPLUGIN_INIT_ENCODED$/ } @list) {
-            push(@list, 'TINYMCEPLUGIN_INIT_ENCODED');
-        }
-        Foswiki::Func::setPreferencesValue(
-            'EXPORTEDPREFERENCES', join(',', @list));
-    }
-    else {
-        # There is no EXPORTEDPREFERENCES preference, so assume that preferences
-        # are not exported automatically and export it here explicitly
-    Foswiki::Func::addToZone('body', 'tinyMCE_init', <<"SCRIPT");
-<script language="javascript" type="text/javascript">foswiki.preferences['TINYMCEPLUGIN_INIT_ENCODED']="$metainit"</script>
+    # SMELL: meta tag now in a separate addToHEAD for Item8566, due to
+    # addToZONE shenanigans. <meta> tags really do have to be in the head!
+    Foswiki::Func::addToZone('head', 'tinyMCE::Meta', <<"SCRIPT");
+<meta name="foswiki.TINYMCEPLUGIN_INIT_ENCODED" content="$metainit" />
 SCRIPT
-    }
 
     my $behaving;
@@ -257 +246 @@
     $encodedVersion =~ s/([^0-9a-zA-Z-_.:~!*'\/%])/'%'.sprintf('%02x',ord($1))/ge;
 
-
     Foswiki::Func::addToZone('body', 'tinyMCE', <<"SCRIPT", 'tinyMCE::Meta, JQUERYPLUGIN::FOSWIKI');
 <script language="javascript" type="text/javascript" src="$tmceURL/tiny_mce_jquery$USE_SRC.js?v=$encodedVersion"></script>