Changeset 3994

Timestamp:

05/30/09 17:32:56 (3 years ago)

Author:

MichaelTempest

Message:

Item5628: Merge to trunk.

Add a URL parameter based on the TinyMCEPlugin.pm $VERSION to the .js URLs (as suggested by Colas Nahaboo)

File:

• trunk/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm (modified) (1 diff)

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

@@ -227 +227 @@
         );
     }
+    # URL-encode the version number to include in the .js URLs, so that the browser re-fetches the .js
+    # when this plugin is upgraded.
+    my $encodedVersion = $VERSION;
+    # SMELL: This regex (and the one applied to $metainit, above) duplicates Foswiki::urlEncode(),
+    #        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;
     Foswiki::Func::addToHEAD( 'tinyMCE', <<SCRIPT);
 <meta name="TINYMCEPLUGIN_INIT" content="$metainit" />
-<script language="javascript" type="text/javascript" src="$tmceURL/tiny_mce$USE_SRC.js"></script>
-<script language="javascript" type="text/javascript" src="$pluginURL/foswiki_tiny$USE_SRC.js"></script>
-<script language="javascript" type="text/javascript" src="$pluginURL/foswiki$USE_SRC.js"></script>
+<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>
+<script language="javascript" type="text/javascript" src="$pluginURL/foswiki$USE_SRC.js?v=$encodedVersion"></script>
 SCRIPT