Skip to content

Commit 4d0def2

Browse files
author
cdot
committed
Item14323: more work simplifying and generalising
1 parent 832a986 commit 4d0def2

File tree

6 files changed

+453
-998
lines changed

6 files changed

+453
-998
lines changed

‎TinyMCEPlugin/data/System/TinyMCEPlugin.txt

Lines changed: 57 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%META:TOPICINFO{author="ProjectContributor" comment="" date="1487762226" format="1.1" version="1"}%
1+
%META:TOPICINFO{author="ProjectContributor" comment="" date="1488486156" format="1.1" version="1"}%
22
%META:TOPICPARENT{name="Plugins"}%
33
---+!! !TinyMCEPlugin
44
<!--
@@ -52,94 +52,42 @@ Below is the default configuration. If it is to be modified, it should be copied
5252
%TWISTY{showlink="Show default parameters..."}%
5353
<verbatim class="js">
5454
%STARTSECTION{"TINYMCEPLUGIN_INIT"}%
55-
"mode" : "textareas",
56-
"editor_selector" : "foswikiWysiwygEdit",
57-
"save_on_tinymce_forms" : true,
58-
"table_default_cellpadding" : 0,
59-
"table_default_cellspacing" : 1,
60-
"table_default_border" : 1,
61-
"theme" : "modern",
62-
"convert_urls" : true,
63-
"relative_urls" : false,
64-
"remove_script_host" : false,
65-
"dialog_type" : "modal",
66-
"extended_valid_elements" : "li[type],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|data*]",
67-
"setupcontent_callback" : "FoswikiTiny.setUpContent",
68-
"save_callback" : "FoswikiTiny.saveCallback",%IF{
69-
"$TINYMCEPLUGIN_DEBUG"
70-
then="
71-
\"debug\" : true,"
72-
}%
73-
"plugins" : "%IF{"defined 'TINYMCEPLUGIN_MCEPLUGINS'"
74-
then="%TINYMCEPLUGIN_MCEPLUGINS%"
75-
else="%STARTSECTION{"MCEPLUGINS"}%contextmenu table searchreplace save autosave paste fullscreen lists link anchor charmap hr code legacyoutput image textcolor colorpicker %ENDSECTION{"MCEPLUGINS"}%"
76-
}%%IF{
77-
"defined 'TINYMCEPLUGIN_ADDITIONAL_MCEPLUGINS'"
78-
then=" %TINYMCEPLUGIN_ADDITIONAL_MCEPLUGINS%"
79-
}%",
80-
"external_plugins" : {
81-
"foswikibuttons": "%PUBURLPATH%/%SYSTEMWEB%/TinyMCEPlugin/plugins/foswikibuttons/editor_plugin.uncompressed.js"
82-
},
83-
"foswiki_secret_id" : "%WYSIWYG_SECRET_ID%",
55+
mode : "textareas",
56+
editor_selector : "foswikiWysiwygEdit",
57+
table_default_cellpadding : 0,
58+
table_default_cellspacing : 1,
59+
table_default_border : 1,
60+
theme : "modern",
61+
skin : "lightgray",
62+
debug : true,
63+
plugins : "contextmenu table searchreplace save autosave paste fullscreen lists link anchor charmap hr code legacyoutput image textcolor colorpicker wordcount",
64+
external_plugins : {
65+
foswikibuttons: "%PUBURLPATH%/%SYSTEMWEB%/TinyMCEPlugin/plugins/foswikibuttons/editor_plugin.uncompressed.js"
66+
},
67+
foswiki_secret_id : "%WYSIWYG_SECRET_ID%",
8468
style_formats: [
85-
{ title: 'Normal', remove: "all" },
86-
{ title: "Heading 1", block: "h1" },
87-
{ title: "Heading 2", block: "h2" },
88-
{ title: "Heading 3", block: "h3" },
89-
{ title: "Heading 4", block: "h4" },
90-
{ title: "Heading 5", block: "h5" },
91-
{ title: "Heading 6", block: "h6" },
92-
{ title: "VERBATIM", block : "pre", "remove" : "all", "classes" : "TMLverbatim" },
93-
{ title: "LITERAL", block : "div", "remove" : "all", "classes" : "WYSIWYG_LITERAL" },
94-
{ title: "Protect on save", block : "div", "remove" : "all", "classes" : "WYSIWYG_PROTECTED" },
95-
{ title: "Protect forever", block : "div", "remove" : "all", "classes" : "WYSIWYG_STICKY" }
96-
],
97-
"foswikibuttons_cursoridletime" : 250,
98-
"paste_create_paragraphs" : true,
99-
"paste_create_linebreaks" : false,
100-
"paste_convert_middot_lists" : true,
101-
"paste_convert_headers_to_strong" : false,
102-
"paste_remove_spans" : true,
103-
"paste_remove_styles" : true,
104-
"paste_strip_class_attributes" : "all",
105-
"menubar" : false,
106-
"toolbar" : "%IF{
107-
"defined 'TINYMCEPLUGIN_BUTTONS1'"
108-
then="%TINYMCEPLUGIN_BUTTONS1%"
109-
else="%STARTSECTION{"BUTTONS1"}%styleselect | bold italic tt forecolor | removeformat | bullist numlist %IF{"context SUPPORTS_PARA_INDENT" then="fwexdent fwindent" else="outdent indent"}% blockquote | link unlink anchor | undo redo | searchreplace table upload insertlink image charmap hr restoredraft fullscreen code hide%ENDSECTION{"BUTTONS1"}%"
110-
}%%IF{
111-
"defined 'TINYMCEPLUGIN_ADDITIONAL_BUTTONS1'"
112-
then=" %TINYMCEPLUGIN_ADDITIONAL_BUTTONS1%"
113-
}%",
114-
"autosave_interval" : "%IF{
115-
"defined 'TINYMCEPLUGIN_AUTOSAVE_INTERVAL'"
116-
then="%TINYMCEPLUGIN_AUTOSAVE_INTERVAL%"
117-
else="%STARTSECTION{"AUTOSAVE_INTERVAL"}%180s%ENDSECTION{"AUTOSAVE_INTERVAL"}%"
118-
}%",
119-
"autosave_retention" : "%IF{
120-
"defined 'TINYMCEPLUGIN_AUTOSAVE_RETENTION'"
121-
then="%TINYMCEPLUGIN_AUTOSAVE_RETENTION%"
122-
else="%STARTSECTION{"AUTOSAVE_RETENTION"}%4320m%ENDSECTION{"AUTOSAVE_RETENTION"}%"
123-
}%",
124-
"entity_encoding" : "%IF{
125-
"defined 'TINYMCEPLUGIN_ENTITY_ENCODING'"
126-
then="%TINYMCEPLUGIN_ENTITY_ENCODING%"
127-
else="%STARTSECTION{"ENTITY_ENCODING"}%numeric%ENDSECTION{"ENTITY_ENCODING"}%"
128-
}%",
129-
"skin" : "%IF{
130-
"defined 'TINYMCEPLUGIN_MCESKIN'"
131-
then="%TINYMCEPLUGIN_MCESKIN%"
132-
else="%STARTSECTION{"MCESKIN"}%lightgray%ENDSECTION{"MCESKIN"}%"
133-
}%",
134-
%IF{
135-
"defined 'TINYMCEPLUGIN_MCESKIN_VARIANT' AND $'TINYMCEPLUGIN_MCESKIN_VARIANT'"
136-
then="\"skin_variant\" : \"%TINYMCEPLUGIN_MCESKIN_VARIANT%\",$n"
137-
else="%IF{
138-
"NOT defined 'TINYMCEPLUGIN_MCESKIN' OR $'TINYMCEPLUGIN_MCESKIN'='lightgray'"
139-
then="\\"skin_variant\\" : \\"%STARTSECTION{"MCESKIN_VARIANT"}%silver%ENDSECTION{"MCESKIN_VARIANT"}%\\",$dollarn"
140-
}%"
141-
}%"keep_styles" : false,
142-
"content_css" : "%PUBURLPATH%/%SYSTEMWEB%/TinyMCEPlugin/wysiwyg.css,%PUBURLPATH%/%SYSTEMWEB%/SkinTemplates/base.css,%FOSWIKI_STYLE_URL%,%FOSWIKI_COLORS_URL%"
69+
{ title: 'Normal', block: "p" },
70+
{ title: "Heading 1", block: "h1" },
71+
{ title: "Heading 2", block: "h2" },
72+
{ title: "Heading 3", block: "h3" },
73+
{ title: "Heading 4", block: "h4" },
74+
{ title: "Heading 5", block: "h5" },
75+
{ title: "Heading 6", block: "h6" },
76+
{ title: "VERBATIM", block : "pre", classes : "TMLverbatim" },
77+
{ title: "LITERAL", block : "div", classes : "WYSIWYG_LITERAL" },
78+
{ title: "Protect on save", block : "div", classes : "WYSIWYG_PROTECTED" },
79+
{ title: "Protect forever", block : "div", classes : "WYSIWYG_STICKY" }
80+
],
81+
style_formats_autohide: true,
82+
removeformat: [
83+
{ selector: 'div,p,pre', remove: 'all' }
84+
],
85+
contextmenu: "link image inserttable | cell row column deletetable | example",
86+
menubar : false,
87+
toolbar : "styleselect | bold italic fwtt forecolor | removeformat | bullist numlist %IF{"context SUPPORTS_PARA_INDENT" then="fwexdent fwindent" else="outdent indent"}% blockquote | link unlink anchor | undo redo | searchreplace table fwupload fwinsertlink image charmap hr restoredraft fullscreen code fwhide",
88+
autosave_interval : "180s",
89+
autosave_retention : "4320m",
90+
content_css: "%PUBURLPATH%/%SYSTEMWEB%/TinyMCEPlugin/wysiwyg.css,%PUBURLPATH%/%SYSTEMWEB%/SkinTemplates/base.css,%FOSWIKI_STYLE_URL%,%FOSWIKI_COLORS_URL%"
14391
%ENDSECTION{"TINYMCEPLUGIN_INIT"}%
14492
</verbatim>
14593
%ENDTWISTY%
@@ -153,22 +101,11 @@ Example:
153101
| *Variable* | *Default* | *Description* |
154102
| =TINYMCEPLUGIN_INIT= | - | A string holding the !TinyMCE initialisation object. If set, =TINYMCEPLUGIN_INIT_TOPIC= is ignored |
155103
| =TINYMCEPLUGIN_INIT_TOPIC= | [[%SYSTEMWEB%.TinyMCEPlugin]] | The fully qualified Web.Topic containing a [[VarSTARTSECTION][section]] named =INIT= which holds the !TinyMCE initialisation parameters |
156-
| =TINYMCEPLUGIN_MCEPLUGINS= | %INCLUDE{"%TOPIC%" section="MCEPLUGINS"}% | Comma separated list of !TinyMCE plugins to initialise |
157-
| =TINYMCEPLUGIN_ADDITIONAL_MCEPLUGINS= || Comma separated list of additional !TinyMCE plugins to initialise. |
158-
| =TINYMCEPLUGIN_BUTTONS1= | %INCLUDE{"%TOPIC%" section="BUTTONS1"}% | Comma separated list of toolbar buttons (in order) for the first, second and third rows (of buttons) |
159-
| =TINYMCEPLUGIN_BUTTONS2= | %INCLUDE{"%TOPIC%" section="BUTTONS2"}% |^|
160-
| =TINYMCEPLUGIN_BUTTONS3= | |^|
161-
| =TINYMCEPLUGIN_ADDITIONAL_BUTTONS1,= %BR% =TINYMCEPLUGIN_ADDITIONAL_BUTTONS2,= %BR% =TINYMCEPLUGIN_ADDITIONAL_BUTTONS3= || Comma separated list of toolbar buttons (in order) to be appended to the end of a button row |
162-
| =TINYMCEPLUGIN_AUTOSAVE_RETENTION= | %INCLUDE{"%TOPIC%" section="AUTOSAVE_RETENTION"}% | Autosave drafts stored in the web browser are expired after this length of time (<span style="font-weight: bold; text-decoration: underline">m</span>inutes or <span style="font-weight: bold; text-decoration: underline">s</span>econds). See =autosave= plugin notes |
163-
| =TINYMCEPLUGIN_AUTOSAVE_INTERVAL= | %INCLUDE{"%TOPIC%" section="AUTOSAVE_INTERVAL"}% | Frequency (in <span style="font-weight: bold; text-decoration: underline">m</span>inutes or <span style="font-weight: bold; text-decoration: underline">s</span>econds) that the autosave plugin updates the draft stored in the web browser |
164104
| =TINYMCEPLUGIN_INIT_browser= | See [[%TOPIC%#Browser_Specific_Settings][Browser Specific Settings]] below | Add extra parameters to =TINYMCEPLUGIN_INIT= string for a specific =_browser= |
165105
| =TINYMCEPLUGIN_DISABLE= | 0 | If set to 1, disables TinyMCEPlugin. _Please use_ =NOWYSIWYG= _instead_ |
166106
| =NOWYSIWYG= | 0 | If this global setting is set to 1, TinyMCEPlugin (and all other WYSIWYG editors) will be disabled. |
167107
| =TINYMCEPLUGIN_BAD_BROWSERS= | =(?i-xsm:Konqueror)= | A regular expression that matches the user-agent string of any browser for which !TinyMCE should not be loaded. |
168108
| =TINYMCEPLUGIN_DEBUG= | 0 | If set to 1, the uncompressed version of !TinyMCE Javascript and CSS sources will be loaded by the browser. Useful for debugging. |
169-
| =TINYMCEPLUGIN_ENTITY_ENCODING= | %INCLUDE{"%TOPIC%" section="ENTITY_ENCODING"}% | Controls how entities/characters get processed by !TinyMCE. Allowed values: =named, numeric, raw= |
170-
| =TINYMCEPLUGIN_MCESKIN= | %INCLUDE{"%TOPIC%" section="MCESKIN"}% | The !TinyMCE skin to use. Possible values: =lightgray= |
171-
| =TINYMCEPLUGIN_MCESKIN_VARIANT= | %INCLUDE{"%TOPIC%" section="MCESKIN_VARIANT"}% | A !TinyMCE skin may have _variants_. |
172109

173110
---+++ Browser Specific Settings
174111
Additional options may be set for specific browsers. You can define extra options for MSIE, OPERA, GECKO, UNKNOWN and SAFARI. For example,
@@ -204,31 +141,10 @@ These plugins are enabled by default in the standard distribution of Foswiki.
204141
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table][table]] | tablecontrols, [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table#Table_controls.2Fbuttons][others]] | Refer to !TinyMCE documentation | |
205142

206143
---+++ Additional Plugins
207-
To enable extra plugins, set the =TINYMCEPLUGIN_ADDITIONAL_MCEPLUGINS= variable in your [[%LOCALSITEPREFS%]].
208-
If the plugin also offers a toolbar button, you will need to add it into the appropriate place in the =TINYMCEPLUGIN_ADDITIONAL_BUTTONS*= variables.
144+
See the Tiny MCE documentation for a complete list of available plugins. To enable extra plugins, set the =TINYMCEPLUGIN_ADDITIONAL_MCEPLUGINS= variable in your [[%LOCALSITEPREFS%]].
209145

210146
For example, to make use of the =emotions= and =wordcount= plugins add the following to [[%LOCALSITEPREFS%]]:
211147

212-
<pre class="tml">
213-
---++ TinyMCE customisations
214-
&nbsp;&nbsp;&nbsp;* Set TINYMCEPLUGIN_ADDITIONAL_MCEPLUGINS = emotions, wordcount
215-
&nbsp;&nbsp;&nbsp;* Set TINYMCEPLUGIN_ADDITIONAL_BUTTONS2 = emotions
216-
</pre>
217-
218-
Some notable plugins:
219-
| *Plugin Name* | *Toolbar buttons* | *Description* | *Notes* |
220-
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize][autoresize]] | - | Automatically resizes the editor to the content inside it | |
221-
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions][emotions]] | emotions | Insert smiley images into the !TinyMCE editable area | |
222-
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/iespell][iespell]] | iespell | Provides spell check for Internet Explorers | |
223-
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/insertdatetime][insertdatetime]] | insertdate, inserttime | Provides buttons to insert customised date and time strings | |
224-
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media][media]] | media | Handles embedded media such as !QuickTime, !Flash, !ShockWave, !RealPlayer and Windows Media Player | Requires customisation of edit templates |
225-
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker][spellchecker]] | spellchecker | Adds spellchecker functionality to !TinyMCE by providing a new button that performs a AJAX call to a backend PHP page that uses PSpell/ASpell or Google spellchecker | |
226-
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style][style]] | styleprops | Adds CSS style editing support to !TinyMCE, this will enable you to edit almost any CSS style property in a visual way. | Generally, HTML/CSS markup in topics is *not* desirable |
227-
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars][visualchars]] | visualchars | Adds the possibility to see invisible characters like =&amp;nbsp;= | |
228-
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount][wordcount]] | - | Display the number of words down in the right corner of the editor. | |
229-
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras][xhtmlxtras]] | cite, ins, del, abbr, acronym | Adds support for some XHTML elements, including cite, ins, del, abbr, and acronym. | Generally, XHTML markup in topics is *not* desirable. Foswiki plugins exist to provide similar functions with more friendly TML markup |
230-
231-
232148
---++ Frequently Asked Questions
233149

234150
The topic [[TinyMCEFrequentlyAskedQuestions]] contains more help with things like: "How do I configure the buttons in my skin?", "How do I disable the WYSIWYG?" etc.
@@ -382,23 +298,23 @@ Many thanks to the following sponsors for supporting this work:
382298
%META:FIELD{name="License" title="License" value="[[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]]"}%
383299
%META:FIELD{name="Home" title="Home" value="Foswiki:Extensions.%25$ROOTMODULE%25"}%
384300
%META:FIELD{name="Support" title="Support" value="Foswiki:Support.%25$ROOTMODULE%25"}%
385-
%META:FILEATTACHMENT{name="wysiwyg.css.gz" attr="h" comment="" date="1487762226" size="390" user="ProjectContributor" version="1"}%
386-
%META:FILEATTACHMENT{name="foswiki_tiny.uncompressed.js" attr="h" comment="" date="1487762226" size="18556" user="ProjectContributor" version="1"}%
387-
%META:FILEATTACHMENT{name="watermark_hidden_verbatim.gif" attr="h" comment="" date="1487762226" size="1654" user="ProjectContributor" version="1"}%
388-
%META:FILEATTACHMENT{name="watermarks.psd" attr="h" comment="" date="1487762226" size="427691" user="ProjectContributor" version="1"}%
389-
%META:FILEATTACHMENT{name="watermark_literal.gif" attr="h" comment="" date="1487762226" size="1029" user="ProjectContributor" version="1"}%
390-
%META:FILEATTACHMENT{name="watermark_protect_on_save.gif" attr="h" comment="" date="1487762226" size="1492" user="ProjectContributor" version="1"}%
391-
%META:FILEATTACHMENT{name="foswiki.uncompressed.js" attr="h" comment="" date="1487762226" size="4233" user="ProjectContributor" version="1"}%
392-
%META:FILEATTACHMENT{name="foswiki_tiny.js.gz" attr="h" comment="" date="1487762226" size="2625" user="ProjectContributor" version="1"}%
393-
%META:FILEATTACHMENT{name="wysiwyg_src.css" attr="h" comment="" date="1487762226" size="1007" user="ProjectContributor" version="1"}%
394-
%META:FILEATTACHMENT{name="watermark_verbatim.gif" attr="h" comment="" date="1487762226" size="1181" user="ProjectContributor" version="1"}%
395-
%META:FILEATTACHMENT{name="wysiwyg.css" attr="h" comment="" date="1487762226" size="827" user="ProjectContributor" version="1"}%
396-
%META:FILEATTACHMENT{name="screenshot.png" attr="h" comment="" date="1487762226" size="30118" user="ProjectContributor" version="1"}%
397-
%META:FILEATTACHMENT{name="watermark_hidden.gif" attr="h" comment="" date="1487762226" size="950" user="ProjectContributor" version="1"}%
398-
%META:FILEATTACHMENT{name="foswiki.js" attr="h" comment="" date="1487762226" size="1847" user="ProjectContributor" version="1"}%
399-
%META:FILEATTACHMENT{name="foswiki.js.gz" attr="h" comment="" date="1487762226" size="869" user="ProjectContributor" version="1"}%
400-
%META:FILEATTACHMENT{name="watermark_protect_forever.gif" attr="h" comment="" date="1487762226" size="1494" user="ProjectContributor" version="1"}%
401-
%META:FILEATTACHMENT{name="tinymce.gif" attr="h" comment="screenshot" date="1487762226" size="35155" user="ProjectContributor" version="1"}%
402-
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1487762226" size="1343" user="ProjectContributor" version="1"}%
403-
%META:FILEATTACHMENT{name="foswiki_tiny.js" attr="h" comment="" date="1487762226" size="8435" user="ProjectContributor" version="1"}%
404-
%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" date="1487762226" size="147" user="ProjectContributor" version="1"}%
301+
%META:FILEATTACHMENT{name="wysiwyg.css.gz" attr="h" comment="" date="1488486156" size="390" user="ProjectContributor" version="1"}%
302+
%META:FILEATTACHMENT{name="foswiki_tiny.uncompressed.js" attr="h" comment="" date="1488486156" size="18556" user="ProjectContributor" version="1"}%
303+
%META:FILEATTACHMENT{name="watermark_hidden_verbatim.gif" attr="h" comment="" date="1488486156" size="1654" user="ProjectContributor" version="1"}%
304+
%META:FILEATTACHMENT{name="watermarks.psd" attr="h" comment="" date="1488486156" size="427691" user="ProjectContributor" version="1"}%
305+
%META:FILEATTACHMENT{name="watermark_literal.gif" attr="h" comment="" date="1488486156" size="1029" user="ProjectContributor" version="1"}%
306+
%META:FILEATTACHMENT{name="watermark_protect_on_save.gif" attr="h" comment="" date="1488486156" size="1492" user="ProjectContributor" version="1"}%
307+
%META:FILEATTACHMENT{name="foswiki.uncompressed.js" attr="h" comment="" date="1488486156" size="4233" user="ProjectContributor" version="1"}%
308+
%META:FILEATTACHMENT{name="foswiki_tiny.js.gz" attr="h" comment="" date="1488486156" size="2625" user="ProjectContributor" version="1"}%
309+
%META:FILEATTACHMENT{name="wysiwyg_src.css" attr="h" comment="" date="1488486156" size="1007" user="ProjectContributor" version="1"}%
310+
%META:FILEATTACHMENT{name="watermark_verbatim.gif" attr="h" comment="" date="1488486156" size="1181" user="ProjectContributor" version="1"}%
311+
%META:FILEATTACHMENT{name="wysiwyg.css" attr="h" comment="" date="1488486156" size="827" user="ProjectContributor" version="1"}%
312+
%META:FILEATTACHMENT{name="screenshot.png" attr="h" comment="" date="1488486156" size="30118" user="ProjectContributor" version="1"}%
313+
%META:FILEATTACHMENT{name="watermark_hidden.gif" attr="h" comment="" date="1488486156" size="950" user="ProjectContributor" version="1"}%
314+
%META:FILEATTACHMENT{name="foswiki.js" attr="h" comment="" date="1488486156" size="1847" user="ProjectContributor" version="1"}%
315+
%META:FILEATTACHMENT{name="foswiki.js.gz" attr="h" comment="" date="1488486156" size="869" user="ProjectContributor" version="1"}%
316+
%META:FILEATTACHMENT{name="watermark_protect_forever.gif" attr="h" comment="" date="1488486156" size="1494" user="ProjectContributor" version="1"}%
317+
%META:FILEATTACHMENT{name="tinymce.gif" attr="h" comment="screenshot" date="1488486156" size="35155" user="ProjectContributor" version="1"}%
318+
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1488486156" size="1343" user="ProjectContributor" version="1"}%
319+
%META:FILEATTACHMENT{name="foswiki_tiny.js" attr="h" comment="" date="1488486156" size="8435" user="ProjectContributor" version="1"}%
320+
%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" date="1488486156" size="147" user="ProjectContributor" version="1"}%

‎TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,7 @@ sub installTinyMCE {
133133

134134
my $scripts = <<"SCRIPT";
135135
<script type="text/javascript">
136-
jQuery(function(\$) { FoswikiTiny.install(); });
137-
FoswikiTiny.init = {$init};
136+
jQuery(function(\$) { FoswikiTiny.init({$init}); });
138137
</script>
139138
SCRIPT
140139

0 commit comments

Comments
 (0)