Item14821: depend on RenderPlugin 6.0

foswiki · Feb 14, 2019 · d22c6ac · d22c6ac
1 parent 4701c6f
commit d22c6ac
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/lib/Foswiki/Contrib/NatSkin.pm b/lib/Foswiki/Contrib/NatSkin.pm
@@ -21,8 +21,8 @@ package Foswiki::Contrib::NatSkin;
 use strict;
 use warnings;
 
-our $VERSION = '6.00';
-our $RELEASE = '12 Feb 2019';
+our $VERSION = '6.01';
+our $RELEASE = '14 Feb 2019';
 our $SHORTDESCRIPTION = 'Userfriendly Foswiki skin providing a flexible theming engine for professional webdesigns';
 
 1;
diff --git a/lib/Foswiki/Contrib/NatSkin/DEPENDENCIES b/lib/Foswiki/Contrib/NatSkin/DEPENDENCIES
@@ -22,7 +22,7 @@ Foswiki::Plugins::NatEditPlugin,>=8.00,perl,Required
 Foswiki::Plugins::NatSkinPlugin,>=4.20,perl,Required
 Foswiki::Plugins::PageOptimizerPlugin,>=0.10,perl,Optional
 Foswiki::Plugins::RedDotPlugin,>=1,perl,Required
-Foswiki::Plugins::RenderPlugin,>=4.00,perl,Required
+Foswiki::Plugins::RenderPlugin,>=6.00,perl,Required
 Foswiki::Plugins::SecurityHeadersPlugin,>=2.00,perl,Optional
 Foswiki::Plugins::TopicInteractionPlugin,>=1340,perl,Required
 Foswiki::Plugins::WebLinkPlugin,>=1,perl,Required

diff --git a/templates/javascript.nat.tmpl b/templates/javascript.nat.tmpl
@@ -8,7 +8,7 @@
 %{}%%TMPL:END%
 
 %TMPL:DEF{"javascript::require"}%%JQREQUIRE{
-  "validate, superfish, ui, blockui, pnotify, farscroll, scrollto, imagetooltip, autosuggest, ui::tooltip, cookie, fontawesome, wikiword, like" 
+  "validate, superfish, ui, blockui, pnotify, farscroll, scrollto, imagetooltip, autosuggest, ui::tooltip, cookie, fontawesome, wikiword, like, foswikitemplate" 
   warn="off"
 }%%TMPL:P{"javascript::require::uploader"}%%TMPL:END%
 
@@ -39,9 +39,8 @@
 %TMPL:DEF{"javascript::topiccreator"}%%ADDTOZONE{
   "script" 
   id="TOPICCREATOR" 
-  requires="JQUERYPLUGIN::WIKIWORD, JQUERYPLUGIN::SCROLLTO"
-  text="<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/RenderPlugin/foswikiTemplate.js'></script>
-<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/NatSkin/topiccreator.js'></script>"
+  requires="JQUERYPLUGIN::WIKIWORD, JQUERYPLUGIN::SCROLLTO, JQUERYPLUGIN::FOSWIKITEMPLATE"
+  text="<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/NatSkin/topiccreator.js'></script>"
 }%%TMPL:END%
 
 %TMPL:DEF{"javascript::solr"}%%ADDTOZONE{