Item15194: make edit toolbar more configurable

foswiki · Jun 7, 2023 · 2ca43dc · 2ca43dc
1 parent 6efb8c1
commit 2ca43dc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/NatEditPlugin/data/System/NatEditPlugin.txt b/NatEditPlugin/data/System/NatEditPlugin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1682492438" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1686134171" format="1.1" version="1"}%
 ---+!! Natural Edit Plugin
 %FORMFIELD{"Description"}%
 
@@ -62,6 +62,7 @@ is sufficient.
 ---++ Change History
 
 %TABLE{columnwidths="7em" tablewidth="100%"}%
+|  07 Jun 2023 | Foswikitask:Item15194: make edit toolbar more configurable |
 |  26 Apr 2023 | Foswikitask:Item15189: fixed redirectto parameter breaking preview function |
 |  17 Jan 2023 | Foswikitask:Item15178: wrong set of permissions selecting "registered users" access in natedit |
 |  25 Jul 2022 | Foswikitask:Item15160: use custom rest handler for the permissions editor |
@@ -200,4 +201,4 @@ is sufficient.
 %META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}%
 %META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/%25$ROOTMODULE%25"}%
 %META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%
-%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1682492438" size="104954" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1686134171" size="104954" user="ProjectContributor" version="1"}%
diff --git a/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm b/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm
@@ -30,8 +30,8 @@ BEGIN {
     }
 }
 
-our $VERSION           = '9.61';
-our $RELEASE           = '26 Apr 2023';
+our $VERSION           = '9.62';
+our $RELEASE           = '07 Jun 2023';
 our $NO_PREFS_IN_TOPIC = 1;
 our $SHORTDESCRIPTION  = 'A Wikiwyg Editor';
 our $baseWeb;

diff --git a/NatEditPlugin/pub/System/NatEditPlugin/jquery.natedit.uncompressed.js b/NatEditPlugin/pub/System/NatEditPlugin/jquery.natedit.uncompressed.js
@@ -539,8 +539,9 @@ $.NatEditor.prototype.initToolbar = function() {
       $txtarea = $(self.txtarea),
       url = foswiki.getScriptUrl('rest', "JQueryPlugin", "tmpl", {
        topic: self.opts.web+"."+self.opts.topic,
-       load:  self.opts.toolbar
-       });
+       load:  self.opts.toolbarTemplate || self.opts.toolbar,
+       name:  self.opts.toolbar,
+      });
 
   // load toolbar
   $.loadTemplate({
@@ -2575,6 +2576,7 @@ $.NatEditor.prototype.parseLinkSelection = function() {
 $.NatEditor.defaults = {
 
   // toolbar template
+  toolbarTemplate: "edittoolbar",
   toolbar: "edittoolbar",
 
   // Elements 0 and 2 are (respectively) prepended and appended.  Element 1 is the default text to use,