Changeset 6429

Timestamp:

02/19/10 01:51:31 (2 years ago)

Author:

PaulHarvey

Message:

Item8566: Accommodate ZonePlugin shenanigans: <meta .../> should be added to the head, not body! This killed TinyMCEPlugin for IE users who run the latest JQueryPlugin+ZonePlugin.

Files:

• branches/Release01x00/TinyMCEPlugin/data/System/TinyMCEPlugin.txt (modified) (1 diff)
• branches/Release01x00/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm (modified) (2 diffs)
• trunk/TinyMCEPlugin/data/System/TinyMCEPlugin.txt (modified) (1 diff)
• trunk/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm (modified) (1 diff)

branches/Release01x00/TinyMCEPlugin/data/System/TinyMCEPlugin.txt

@@ -168 +168 @@
 |  Release: | %$RELEASE% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  19 Feb 2010 | Foswikitask:Item8566: Fix for sites with latest JQueryPlugin where IE users get: "Unable to install !TinyMCE; &lt;META..." |
 |  29 Dec 2009 | Foswikitask:Item2447: Fix unable to apply "Normal" format in some browsers (notes added to System topic)<br/> Foswikitask:Item1462: Block attachments to unsaved AUTOINC topics |
 |  25 Nov 2009 | Foswikitask:Item2412: Inserting images - fixed a problem where it wasn't easy (impossible unless > 1 attachments) to select the first image in the attachment list; improved layout of dialog window where preview obscures insert/cancel buttons. |

branches/Release01x00/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm

@@ -19 +19 @@
 
 our $VERSION           = '$Rev$';
-our $RELEASE           = '29 Dec 2009';
+our $RELEASE           = '19 Feb 2010';
 our $SHORTDESCRIPTION  = 'Integration of the Tiny MCE WYSIWYG Editor';
 our $NO_PREFS_IN_TOPIC = 1;
@@ -235 +235 @@
     #        but Foswiki::Func.pm does not expose that function, so plugins may not use it
     $encodedVersion =~ s/([^0-9a-zA-Z-_.:~!*'\/%])/'%'.sprintf('%02x',ord($1))/ge;
+
+    # 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::addToHEAD( 'tinyMCE::Meta', <<SCRIPT);
+<meta name="TINYMCEPLUGIN_INIT" content="$metainit" />
+SCRIPT
+
     Foswiki::Func::addToHEAD( 'tinyMCE', <<SCRIPT);
-<meta name="TINYMCEPLUGIN_INIT" content="$metainit" />
 <script language="javascript" type="text/javascript" src="$tmceURL/tiny_mce$USE_SRC.js?v=$encodedVersion"></script>
 <script language="javascript" type="text/javascript" src="$pluginURL/foswiki_tiny$USE_SRC.js?v=$encodedVersion"></script>

trunk/TinyMCEPlugin/data/System/TinyMCEPlugin.txt

@@ -179 +179 @@
 |  Release: | %$RELEASE% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  19 Feb 2010 | Foswikitask:Item8566: Fix for sites with latest JQueryPlugin where IE users get: "Unable to install !TinyMCE; &lt;META..." |
 |  24 Jan 2010 | Foswikitask:Item8416: add TINYMCEPLUGIN_ADDITIONAL_MCEPLUGINS and TINYMCEPLUGIN_BUTTONS(123) to allow wiki, web and topic specific plugins to be added [[Foswiki:Main.SvenDowideit][SD]] |
 |  29 Dec 2009 | Foswikitask:Item2447: Fix unable to apply "Normal" format in some browsers (notes added to System topic)<br/> Foswikitask:Item1462: Block attachments to unsaved AUTOINC topics |

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

@@ -235 +235 @@
     #        but Foswiki::Func.pm does not expose that function, so plugins may not use it
     $encodedVersion =~ s/([^0-9a-zA-Z-_.:~!*'\/%])/'%'.sprintf('%02x',ord($1))/ge;
+
+    # 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::addToHEAD( 'tinyMCE::Meta', <<SCRIPT);
+<meta name="TINYMCEPLUGIN_INIT" content="$metainit" />
+SCRIPT
+
     Foswiki::Func::addToHEAD( 'tinyMCE', <<SCRIPT, 'JQUERYPLUGIN::FOSWIKI');
-<meta name="TINYMCEPLUGIN_INIT" content="$metainit" />
 <script language="javascript" type="text/javascript" src="$tmceURL/tiny_mce_jquery$USE_SRC.js?v=$encodedVersion"></script>
 <script language="javascript" type="text/javascript" src="$pluginURL/foswiki_tiny$USE_SRC.js?v=$encodedVersion"></script>