diff --git a/-new-material-templates/configuration-options-templates/ROOT/pages/content..adoc b/-new-material-templates/configuration-options-templates/ROOT/pages/content.{appearance-behavior-filtering-or-formatting}.adoc similarity index 100% rename from -new-material-templates/configuration-options-templates/ROOT/pages/content..adoc rename to -new-material-templates/configuration-options-templates/ROOT/pages/content.{appearance-behavior-filtering-or-formatting}.adoc diff --git a/-new-material-templates/configuration-options-templates/ROOT/partials/configuration/.adoc b/-new-material-templates/configuration-options-templates/ROOT/partials/configuration/{configuration_option}.adoc similarity index 100% rename from -new-material-templates/configuration-options-templates/ROOT/partials/configuration/.adoc rename to -new-material-templates/configuration-options-templates/ROOT/partials/configuration/{configuration_option}.adoc diff --git a/-new-material-templates/integration-example-(ie)-templates/ROOT/examples/live-demos/ie-/index.html b/-new-material-templates/integration-example-(ie)-templates/ROOT/examples/live-demos/ie-{hyphen-delimited-descriptor}/index.html similarity index 100% rename from -new-material-templates/integration-example-(ie)-templates/ROOT/examples/live-demos/ie-/index.html rename to -new-material-templates/integration-example-(ie)-templates/ROOT/examples/live-demos/ie-{hyphen-delimited-descriptor}/index.html diff --git a/-new-material-templates/integration-example-(ie)-templates/ROOT/examples/live-demos/ie-/index.js b/-new-material-templates/integration-example-(ie)-templates/ROOT/examples/live-demos/ie-{hyphen-delimited-descriptor}/index.js similarity index 100% rename from -new-material-templates/integration-example-(ie)-templates/ROOT/examples/live-demos/ie-/index.js rename to -new-material-templates/integration-example-(ie)-templates/ROOT/examples/live-demos/ie-{hyphen-delimited-descriptor}/index.js diff --git a/-new-material-templates/integration-example-(ie)-templates/ROOT/pages/ie-.adoc b/-new-material-templates/integration-example-(ie)-templates/ROOT/pages/ie-{hyphen-delimited-descriptor}.adoc similarity index 100% rename from -new-material-templates/integration-example-(ie)-templates/ROOT/pages/ie-.adoc rename to -new-material-templates/integration-example-(ie)-templates/ROOT/pages/ie-{hyphen-delimited-descriptor}.adoc diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos/full-featured/index.html b/-new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos/full-featured/index.html index 4896337a72..18c2f7c5fb 100644 --- a/-new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos/full-featured/index.html +++ b/-new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos/full-featured/index.html @@ -1,6 +1,5 @@ \ No newline at end of file diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos/full-featured/index.js b/-new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos/full-featured/index.js index 962b99b07b..27f5ea1887 100644 --- a/-new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos/full-featured/index.js +++ b/-new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos/full-featured/index.js @@ -1,6 +1,6 @@ /* -Add new plugin to this file’s extant configuration +Update tinymce-docs/modules/ROOT/examples/live-demos/full-featured/index.js to include the new plugin. */ diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos//example.js b/-new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos/{plugincode}/example.js similarity index 91% rename from -new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos//example.js rename to -new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos/{plugincode}/example.js index 30d2613ffa..6b8e2b18e0 100644 --- a/-new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos//example.js +++ b/-new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos/{plugincode}/example.js @@ -23,7 +23,7 @@ NB: there is one UX consequence of setting up demos to work in these cases. The *Edit on CodePen* tab does not — and cannot — present in the documentation. -The initial setup of these ‘inclues-an-emulated-back-end’ examples +The initial setup of these ‘includes-an-emulated-back-end’ examples will almost certainly include significant initial input from the plugin’s developer. diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos//index.html b/-new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos/{plugincode}/index.html similarity index 100% rename from -new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos//index.html rename to -new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos/{plugincode}/index.html diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos//index.js b/-new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos/{plugincode}/index.js similarity index 100% rename from -new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos//index.js rename to -new-material-templates/plugin-documentation-templates/ROOT/examples/live-demos/{plugincode}/index.js diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/nav.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/nav.adoc index a91d9c153d..a36b79c6e7 100644 --- a/-new-material-templates/plugin-documentation-templates/ROOT/nav.adoc +++ b/-new-material-templates/plugin-documentation-templates/ROOT/nav.adoc @@ -1,13 +1,8 @@ * xref:plugins.adoc[Plugins] ** Premium plugins -// If the new plugin is a Premium plugin -// Replace the boilerplate below with the file-name of the new Premium plugin. -// Also, place this new Premium plugin into alphabetical place within the Premium plugin sub-section. -*** xref:.adoc[] -** Open source plugins -// If the new plugin is an open source plugin -// Replace the boilerplate below with the file-name of the new open source plugin. -// Also, place this new open source plugin into alphabetical place within the open source plugin sub-section. -*** xref:.adoc[] +// If Premium plugin, place the following entry into Premium plugins list in alphabetical order by plugin name. +*** xref:.adoc[] -// This file is instructional and is never included in the published name-space. +** Open source plugins +// If Open source plugin, place the following entry into Open source plugins list in alphabetical order by plugin name. +*** xref:.adoc[] diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/pages/available-menu-items.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/pages/available-menu-items.adoc index b25859f6a6..79b053e32e 100644 --- a/-new-material-templates/plugin-documentation-templates/ROOT/pages/available-menu-items.adoc +++ b/-new-material-templates/plugin-documentation-templates/ROOT/pages/available-menu-items.adoc @@ -1,13 +1,6 @@ -// 0. Set :plugincategory: to appropriate value -// 1. premium; or -// 2. opensource. -// Note neither value is capitalised. -// Note the second value has no space between the two words. -// 1. Replace instances with appropriate material. -// 2. Add the edited material to -// /tinymce-docs/modules/ROOT/pages/available-menu-items.adoc -// in alphabetical order by . (*not* ). -// 3. Do not bring these comments over with the edited material. +// Add the edited material to +// tinymce-docs/modules/ROOT/pages/available-menu-items.adoc +// in alphabetical order by . (*not* ). :plugincategory: :pluginname: diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/pages/available-toolbar-buttons.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/pages/available-toolbar-buttons.adoc index 564aeb501e..f4864cd218 100644 --- a/-new-material-templates/plugin-documentation-templates/ROOT/pages/available-toolbar-buttons.adoc +++ b/-new-material-templates/plugin-documentation-templates/ROOT/pages/available-toolbar-buttons.adoc @@ -1,13 +1,6 @@ -// 0. Set :plugincategory: to appropriate value -// 1. premium; or -// 2. opensource. -// Note neither value is capitalised. -// Note the second value has no space between the two words. -// 1. Replace instances with appropriate material. -// 2. Add the edited material to -// /tinymce-docs/modules/ROOT/pages/available-toolbar-buttons.adoc -// in alphabetical order by . (*not* ). -// 3. Do not bring these comments over with the edited material. +// Add the edited material to +// tinymce-docs/modules/ROOT/pages/available-toolbar-buttons.adoc +// in alphabetical order by . (*not* ). :plugincategory: :pluginname: diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/pages/editor-command-identifiers.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/pages/editor-command-identifiers.adoc index cbc92854c5..dd4ba23052 100644 --- a/-new-material-templates/plugin-documentation-templates/ROOT/pages/editor-command-identifiers.adoc +++ b/-new-material-templates/plugin-documentation-templates/ROOT/pages/editor-command-identifiers.adoc @@ -1,16 +1,14 @@ -// 0. Replace instances with appropriate material. -// 1. Add the edited material to -// /tinymce-docs/modules/ROOT/pages/editor-command-identifiers.adoc -// in alphabetical order by . (*not* ). -// 2. Do not bring these comments over with the edited material. +// Add the edited material to +// tinymce-docs/modules/ROOT/pages/editor-command-identifiers.adoc +// in alphabetical order by . (*not* ). -// add an xref in alphabetical order to the summary list that is below the following lines: +// add an xref in alphabetical order by to the summary list that is below the following lines: // [[plugin-commands]] // === Plugin Commands * xref:[] -// add the include in alphabetical order to the body of the "Plugin Commands" section +// add the include in alphabetical order by to the body of the "Plugin Commands" section [[]] ==== diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/pages/events.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/pages/events.adoc index b71e0f83d6..8898c1f2f8 100644 --- a/-new-material-templates/plugin-documentation-templates/ROOT/pages/events.adoc +++ b/-new-material-templates/plugin-documentation-templates/ROOT/pages/events.adoc @@ -1,15 +1,13 @@ -// 0. Replace instances with appropriate material. -// 1. Add the edited material to -// /tinymce-docs/modules/ROOT/pages/events.adoc -// in alphabetical order by . (*not* ). -// 2. Do not bring these comments over with the edited material. +// Add the edited material to +// tinymce-docs/modules/ROOT/pages/events.adoc +// in alphabetical order by . (*not* ). // add the xref in alphabetical order to the summary list that is below the following line: // == Plugin events * xref:-events[ events] -// add the include in alphabetical order to the body of the "Plugin events" section +// add the include in alphabetical order by to the body of the "Plugin events" section [[-events]] === events diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/pages/pluginpage.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/pages/pluginpage.adoc index 7ecc5c616f..398444a855 100644 --- a/-new-material-templates/plugin-documentation-templates/ROOT/pages/pluginpage.adoc +++ b/-new-material-templates/plugin-documentation-templates/ROOT/pages/pluginpage.adoc @@ -1,6 +1,3 @@ -// Replace instances with material then remove this, and other comments. - -// : the product name. Reference on this page with the {pluginname} variable. = plugin :navtitle: :description: . @@ -11,25 +8,22 @@ // opensource plugin = tieroneplan // premium plugin = tiertwoplan or tierthreeplan or enterpriseplan :pluginminimumplan: -// : adds the plugin to an editor configuration. -// Reference on this page with the {plugincode} variable :plugincode: -:plugincategory: premium|opensource +:plugincategory: // Remove the line below (and this comment) for open source plugins include::partial$misc/admon-premium-plugin.adoc[] -// Edit the line below to add the correct requires- file from `/partials/misc`. +// Edit the line below to add the correct requires- file from `tinymce-docs/modules/ROOT/partials/misc`. include::partial$misc/admon-requires-v.adoc // Add an introduction. What does the plugin do? Why would I use this plugin? Keep it concise. == Interactive example -// No Lorem Ipsum. Add test material, or, at least, a description of how end-users use the feature. liveDemo::{plugincode}[] -// Logic for customising what presents from this included file relies on +// Logic for customizing what presents from this included file relies on // the :pluginminimumplan: attribute value above. // // 2023-09-06 addendum: the logic in purchase-premium-plugins.adoc needs @@ -49,9 +43,9 @@ For example: ---- tinymce.init({ selector: 'textarea', // change this value according to your HTML - plugins: '{{plugincode}}', + plugins: '', toolbar: '', - an_essential_option: false + : false }); ---- @@ -65,9 +59,7 @@ The following configuration options affect the behavior of the {pluginname} plug // The template file for each such file is // -new-material-templates/partials/commands/.adoc // Add one include:: statement for each added file as per the example immediately below. -include::partial$configuration/.adoc[][leveloffset=+1] - - +include::partial$configuration/.adoc[leveloffset=+1] // If the plugin offers toolbar buttons // 1. Add an entry to /pages/available-toolbar-buttons.adoc @@ -131,6 +123,4 @@ include::partial$events/{plugincode}-events.adoc[] The {pluginname} plugin provides the following APIs. -include::partial$plugin-apis/{plugincode}-apis.adoc[] - -// Remove all comment lines and comment blocks before publishing. +include::partial$plugin-apis/{plugincode}-apis.adoc[] \ No newline at end of file diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/partials/commands/-cmds.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/partials/commands/-cmds.adoc deleted file mode 100644 index 33fcc82704..0000000000 --- a/-new-material-templates/plugin-documentation-templates/ROOT/partials/commands/-cmds.adoc +++ /dev/null @@ -1,62 +0,0 @@ -[cols="1,3",options="header"] -|=== -|Command |Description - -|mceCommandOne |Description one. -// Boilerplate for commands that require further documentation -|mceCommandTwo |Description two. For details, see xref:using-mcecommandtwo[Using `+mcecommandtwo+`]. -|mceCommandThree |Description three. -|mceCommandFour |Description four. -|mceCommandFive |Description five. -|mceCommandSix |Description six. -// Boilerplate for commands that require further documentation -|mceCommandSeven |Description seven. For details, see xref:using-mcecommandseven[Using `+mcecommandtwo+`]. -|mceCommandEn |Description en. -|=== - -.Examples -[source,js] ----- -tinymce.activeEditor.execCommand('mceCommandOne'); -tinymce.activeEditor.execCommand('mceCommandTwo', true|false, { : '', : '', : '', : '' }); -tinymce.activeEditor.execCommand('mceCommandThree'); -tinymce.activeEditor.execCommand('mceCommandFour'); -tinymce.activeEditor.execCommand('mceCommandFive'); -tinymce.activeEditor.execCommand('mceCommandSix'); -tinymce.activeEditor.execCommand('mceCommandSeven', true|false, { : '' }); ----- - -// Boilerplate for further documentation of commands that require it. -[[using-mcecommmandtwo]] -== Using `+mcecommandtwo+` - -`+mceCommandTwo+` accepts an object with the following key-value pairs: - -[cols="1,,1,2",options="header"] -|=== -|Name |Value |Requirement |Description - -| |`+'this'+` or `+'that'+` | [Rr]equired |Key-value description one. -| |`+number+` | [Rr]equired |Key-value description two. -| |`+'other'+`, `+'thing'+`, `+'doohickie'+`, or `+'widget'+` | [Rr]equired |Key-value description three. -| |`+'word'+` or `+'notword'+` | [Rr]equired |Key-value description four. -|=== - -// Further notes as required. Delete this comment once notes are added or if they are not required. - -// Boilerplate for further documentation of commands that require it. -[[using-mcetabletoggleseries]] -== Using `+mceTableToggleSeries+` - -`+mceCommandSeven+` accepts an object with the following key-value pair: - -[cols="1,1,1,2",options="header"] -|=== -|Name |Value |Requirement |Description - -| |`+string+` | [Rr]equired |Key-value description five. -|=== - -// Further notes as required. Delete this comment once notes are added or if they are not required. - -// Remove all comment lines and comment blocks before publishing. diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/partials/commands/{plugincode}-cmds.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/partials/commands/{plugincode}-cmds.adoc new file mode 100644 index 0000000000..9d61f6860b --- /dev/null +++ b/-new-material-templates/plugin-documentation-templates/ROOT/partials/commands/{plugincode}-cmds.adoc @@ -0,0 +1,33 @@ +[cols="1,3",options="header"] +|=== +|Command |Description + +| | +// Boilerplate for commands that require further documentation +| |Description two. For details, see xref:using-[Using `++`]. +|=== + +.Examples +[source,js] +---- +tinymce.activeEditor.execCommand(''); +tinymce.activeEditor.execCommand('', , { : '', : '' }); +---- + +// Boilerplate for further documentation of commands that require it. +[[using-]] +== Using `++` + +`++` accepts an object with the following key-value pairs: + +[cols="1,,1,2",options="header"] +|=== +|Name |Value |Requirement |Description + +| |`+''+` or `+''+` |equired | +| |`++` |equired | +|=== + +// Further notes as required. Delete this comment once notes are added or if they are not required. + +// Remove all comment lines and comment blocks before publishing. diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/partials/configuration/icon_list.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/partials/configuration/icon_list.adoc index 692ae906f5..531b26502b 100644 --- a/-new-material-templates/plugin-documentation-templates/ROOT/partials/configuration/icon_list.adoc +++ b/-new-material-templates/plugin-documentation-templates/ROOT/partials/configuration/icon_list.adoc @@ -1,7 +1,6 @@ -// 0. Replace instances with appropriate material. -// 1. Add the edited material to -// /tinymce-docs/modules/ROOT/partials/configuration/icon_list.adoc +// 1. Replace instances with appropriate material. +// 2. Add the edited material to +// tinymce-docs/modules/ROOT/partials/configuration/icon_list.adoc // in alphabetical order by . (*not* ). -// 2. Do not bring these comments over with the edited material. | `++` | image:icons/.svg[.svg] | `+.svg+` diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/partials/configuration/.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/partials/configuration/{configuration_option}.adoc similarity index 66% rename from -new-material-templates/plugin-documentation-templates/ROOT/partials/configuration/.adoc rename to -new-material-templates/plugin-documentation-templates/ROOT/partials/configuration/{configuration_option}.adoc index 05bc7e93ea..391b450c3b 100644 --- a/-new-material-templates/plugin-documentation-templates/ROOT/partials/configuration/.adoc +++ b/-new-material-templates/plugin-documentation-templates/ROOT/partials/configuration/{configuration_option}.adoc @@ -1,12 +1,6 @@ [[]] == `` -// Replace all instances of with the -// configuration option name then remove this comment. - -// Add explanatory material as per the comment block below then remove -// the block and this comment. - //// What does the option do? Why use it? @@ -32,7 +26,7 @@ Are there risks? [source,js] ---- tinymce.init({ - selector: 'textarea', // change this value according to your html + selector: 'textarea', // Change this value according to your HTML : '' }); ---- @@ -46,24 +40,18 @@ To disable , set `` to `false`. [source,js] ---- tinymce.init({ - selector: 'textarea', // change this value according to your HTML + selector: 'textarea', // Change this value according to your HTML : 'false' }); ---- // Remove if not applicable. -// Edit the sub-head to singular or plural as required. -=== Limitation(s) of the `` option +=== Limitation of the `` option The `` option has the following limitations. -// Add explanatory material as per the comment block below then remove -// the block and this comment. - //// Known limitations. Complicated scenarios. Anything that warrants a CAUTION or WARNING admonition. -//// - -// Remove all comment lines and comment blocks before publishing. +//// \ No newline at end of file diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/partials/events/-events.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/partials/events/{plugincode}-events.adoc similarity index 90% rename from -new-material-templates/plugin-documentation-templates/ROOT/partials/events/-events.adoc rename to -new-material-templates/plugin-documentation-templates/ROOT/partials/events/{plugincode}-events.adoc index 245d8f32a5..2ac4644b64 100644 --- a/-new-material-templates/plugin-documentation-templates/ROOT/partials/events/-events.adoc +++ b/-new-material-templates/plugin-documentation-templates/ROOT/partials/events/{plugincode}-events.adoc @@ -3,8 +3,6 @@ The following events are provided by the xref:.adoc[ pl [cols="1,1,2",options="header"] |=== |Name |Data |Description - -// Five boilerplate rows. |EventOne |`+{ : }+` |Fired when event one description. |EventTwo |`+{ : , : }+` |Fired when event two description. |EventThree |N/A |Fired when event three description. @@ -16,6 +14,4 @@ The following events are provided by the xref:.adoc[ pl include::partial$misc/admon-requires-v.adoc[] |EventFour |`+{ : }+` |Fired when the event seven description. |EventEn |`+{ : , : }+` |Fired when event en description. -|=== - -// Remove all comment lines and comment blocks before publishing. +|=== \ No newline at end of file diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/partials/index-pages/opensource-plugins.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/partials/index-pages/opensource-plugins.adoc index ee3711a78f..92e47189f3 100644 --- a/-new-material-templates/plugin-documentation-templates/ROOT/partials/index-pages/opensource-plugins.adoc +++ b/-new-material-templates/plugin-documentation-templates/ROOT/partials/index-pages/opensource-plugins.adoc @@ -1,10 +1,8 @@ // Table row for an open-source plugin. -// Place this row into the extant table in `partials/index-pages/opensource-plugins.adoc` in alphabetical order. +// Place this row into the existing table in `partials/index-pages/opensource-plugins.adoc` in alphabetical order by . a| [.lead] xref:.adoc[] - - -// This file is instructional and is never included in the published name-space. + \ No newline at end of file diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/partials/index-pages/premium-plugins.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/partials/index-pages/premium-plugins.adoc index 472431f303..d8905d4459 100644 --- a/-new-material-templates/plugin-documentation-templates/ROOT/partials/index-pages/premium-plugins.adoc +++ b/-new-material-templates/plugin-documentation-templates/ROOT/partials/index-pages/premium-plugins.adoc @@ -1,10 +1,8 @@ // Table row for a Premium plugin. -// Place this row into the extant table in `partials/index-pages/premium-plugins.adoc` in alphabetical order. +// Place this row into the existing table in `partials/index-pages/premium-plugins.adoc` in alphabetical order by . a| [.lead] xref:.adoc[] - - -// This file is instructional and is never included in the published name-space. + \ No newline at end of file diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/partials/menu-item-ids/-menu-items.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/partials/menu-item-ids/-menu-items.adoc deleted file mode 100644 index c6cc961a91..0000000000 --- a/-new-material-templates/plugin-documentation-templates/ROOT/partials/menu-item-ids/-menu-items.adoc +++ /dev/null @@ -1,10 +0,0 @@ -[cols="1,1,2",options="header"] -|=== -|Menu item identifier |xref:menus-configuration-options.adoc#example-the-tinymce-default-menu-items[Default Menu Location] |Description - -|`+menu-identifier-1+` | |Description one. -|`+menu-identifier-2+` | |Description two. -|`+menu-identifier-n+` | |Description en. -|=== - -// Remove all comment lines and comment blocks before publishing. diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/partials/menu-item-ids/{plugincode}-menu-items.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/partials/menu-item-ids/{plugincode}-menu-items.adoc new file mode 100644 index 0000000000..f7bc1b666e --- /dev/null +++ b/-new-material-templates/plugin-documentation-templates/ROOT/partials/menu-item-ids/{plugincode}-menu-items.adoc @@ -0,0 +1,7 @@ +[cols="1,1,2",options="header"] +|=== +|Menu item identifier |xref:menus-configuration-options.adoc#example-the-tinymce-default-menu-items[Default Menu Location] |Description + +|`+menu-item-id-1+` | | +|`+menu-item-id-2+` | | +|=== \ No newline at end of file diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/partials/plugin-apis/-apis.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/partials/plugin-apis/{plugincode}-apis.adoc similarity index 58% rename from -new-material-templates/plugin-documentation-templates/ROOT/partials/plugin-apis/-apis.adoc rename to -new-material-templates/plugin-documentation-templates/ROOT/partials/plugin-apis/{plugincode}-apis.adoc index 29c7a14c12..6ed4b64b52 100644 --- a/-new-material-templates/plugin-documentation-templates/ROOT/partials/plugin-apis/-apis.adoc +++ b/-new-material-templates/plugin-documentation-templates/ROOT/partials/plugin-apis/{plugincode}-apis.adoc @@ -2,18 +2,14 @@ |=== |Name |Arguments |Description -// Four boilerplate rows. | | | -| | | -| | | // Markup to add a ‘requires this version of TinyMCE’ admonition into its own row // immediately above the event requiring such a notice. // If not needed, remove the markup and this comment. // If needed, edit the file-name and remove this comment. 3+| include::partial$misc/admon-requires-v.adoc[] -| | | -| | | +| | | |=== .Examples @@ -24,15 +20,4 @@ tinymce.activeEditor.plugins..(); // what this example does tinymce.activeEditor.plugins..(); - -// what this example does -tinymce.activeEditor.plugins..(); - -// what this example does -tinymce.activeEditor.plugins..(); - -// what this example does -tinymce.activeEditor.plugins..(); ---- - -// Remove all comment lines and comment blocks before publishing. diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/partials/toolbar-button-ids/-toolbar-buttons.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/partials/toolbar-button-ids/-toolbar-buttons.adoc deleted file mode 100644 index 8d7d27663a..0000000000 --- a/-new-material-templates/plugin-documentation-templates/ROOT/partials/toolbar-button-ids/-toolbar-buttons.adoc +++ /dev/null @@ -1,11 +0,0 @@ -[cols="1,3",options="header"] -|=== -|Toolbar button identifier |Description - -|`+ai-button-1+` |Description one. -|`+ai-button-2+` |Description two. -|`+ai-button-3+` |Description three. -|`+ai-button-n+` |Description en. -|=== - -// Remove all comment lines and comment blocks before publishing. diff --git a/-new-material-templates/plugin-documentation-templates/ROOT/partials/toolbar-button-ids/{plugincode}-toolbar-buttons.adoc b/-new-material-templates/plugin-documentation-templates/ROOT/partials/toolbar-button-ids/{plugincode}-toolbar-buttons.adoc new file mode 100644 index 0000000000..3a8f5f30be --- /dev/null +++ b/-new-material-templates/plugin-documentation-templates/ROOT/partials/toolbar-button-ids/{plugincode}-toolbar-buttons.adoc @@ -0,0 +1,7 @@ +[cols="1,3",options="header"] +|=== +|Toolbar button identifier |Description + +|`+toolbar-button-id-1+` | +|`+toolbar-button-id-2+` | +|=== \ No newline at end of file diff --git a/-new-material-templates/release-notes-template/ROOT/nav.adoc b/-new-material-templates/release-notes-template/ROOT/nav.adoc index c04931033b..839dc79e6d 100644 --- a/-new-material-templates/release-notes-template/ROOT/nav.adoc +++ b/-new-material-templates/release-notes-template/ROOT/nav.adoc @@ -1,4 +1,4 @@ -// The following two lines are already extant in `nav.adoc` and are here as a guidepost. +// The following two lines already exist in `nav.adoc` and are here as a guidepost. // The new navigation material is added immediately below these lines. * Release information ** xref:release-notes.adoc[Release notes for {productname} {productmajorversion}] @@ -18,6 +18,4 @@ **** xref:-release-notes.adoc#bug-fixes[Bug fixes] **** xref:-release-notes.adoc#security-fixes[Security fixes] **** xref:-release-notes.adoc#deprecated[Deprecated] -**** xref:-release-notes.adoc#known-issues[Known issues] - -// This file is instructional and is never included in the published name-space. +**** xref:-release-notes.adoc#known-issues[Known issues] \ No newline at end of file diff --git a/-new-material-templates/release-notes-template/ROOT/pages/release-notes.adoc b/-new-material-templates/release-notes-template/ROOT/pages/release-notes.adoc index 969edeb032..0b66f575d4 100644 --- a/-new-material-templates/release-notes-template/ROOT/pages/release-notes.adoc +++ b/-new-material-templates/release-notes-template/ROOT/pages/release-notes.adoc @@ -5,17 +5,4 @@ xref:-release-notes.adoc#overview[{productname} ] Release notes for {productname} -//rest of extant table here - -// Dummy table cell. -// 1. When the number of cells in the table is odd: -// * remove the inline comment markup pre-pending this -// element. -// -// 2. When the number of cells in the table is even: -// * prepend the inline comment markup to this -// element. -//a| - -|=== - +// Remember to uncomment the dummy cell when the number of cells in the table is odd to ensure the table renders correctly. diff --git a/-new-material-templates/release-notes-template/ROOT/pages/-release-notes.adoc b/-new-material-templates/release-notes-template/ROOT/pages/{x.y[.z]}-release-notes.adoc similarity index 72% rename from -new-material-templates/release-notes-template/ROOT/pages/-release-notes.adoc rename to -new-material-templates/release-notes-template/ROOT/pages/{x.y[.z]}-release-notes.adoc index aac899c021..fd60f60040 100644 --- a/-new-material-templates/release-notes-template/ROOT/pages/-release-notes.adoc +++ b/-new-material-templates/release-notes-template/ROOT/pages/{x.y[.z]}-release-notes.adoc @@ -1,15 +1,17 @@ -= TinyMCE -:navtitle: TinyMCE -:description: Release notes for TinyMCE += {productname} {release-version} +:release-version: +:navtitle: {productname} {release-version} +:description: Release notes for {productname} {release-version} :keywords: releasenotes, new, changes, bugfixes :page-toclevels: 1 include::partial$misc/admon-releasenotes-for-stable.adoc[] + [[overview]] == Overview -{productname} was released for {enterpriseversion} and {cloudname} on ,
^^, . These release notes provide an overview of the changes for {productname} , including: +{productname} {release-version} was released for {enterpriseversion} and {cloudname} on ,
^^, . These release notes provide an overview of the changes for {productname} {release-version}, including: // Remove sections and section boilerplates as necessary. // Pluralise as necessary or remove the placeholder plural marker. @@ -31,7 +33,7 @@ include::partial$misc/admon-releasenotes-for-stable.adoc[] [[new-premium-plugin]] New Premium plugin -The following new Premium plugin was released alongside {productname} . +The following new Premium plugin was released alongside {productname} {release-version}. === @@ -43,7 +45,7 @@ For information on the **** plugin, see xref:.a [[new-open-source-plugin]] == New Open Source plugin -The following new Open Source plugin was released alongside {productname} . +The following new Open Source plugin was released alongside {productname} {release-version}. === @@ -51,14 +53,15 @@ The new open source plugin, **** // description here. For information on the **** plugin, see xref:.adoc[]. + [[accompanying-premium-plugin-changes]] == Accompanying Premium plugin changes -The following premium plugin updates were released alongside {productname} . +The following premium plugin updates were released alongside {productname} {release-version}. === -The {productname} release includes an accompanying release of the **** premium plugin. +The {productname} {release-version} release includes an accompanying release of the **** premium plugin. **** includes the following . @@ -92,13 +95,13 @@ The following open source plugin has been announced as reaching its end-of-life: [[accompanying-enhanced-skins-and-icon-packs-changes]] == Accompanying Enhanced Skins & Icon Packs changes -The {productname} release includes an accompanying release of the **Enhanced Skins & Icon Packs**. +The {productname} {release-version} release includes an accompanying release of the **Enhanced Skins & Icon Packs**. === Enhanced Skins & Icon Packs The **Enhanced Skins & Icon Packs** release includes the following updates: -The **Enhanced Skins & Icon Packs** were rebuilt to pull in the changes also incorporated into the default {productname} skin, Oxide. +The **Enhanced Skins & Icon Packs** were rebuilt to pull in the changes also incorporated into the default {productname} {release-version} skin, Oxide. For information on using Enhanced Skins & Icon Packs, see: xref:enhanced-skins-and-icon-packs.adoc[Enhanced Skins & Icon Packs]. @@ -106,7 +109,7 @@ For information on using Enhanced Skins & Icon Packs, see: xref:enhanced-skins-a [[improvements]] == Improvements -{productname} also includes the following improvement: +{productname} {release-version} also includes the following improvement: === // #TINY-vwxyz1 @@ -117,7 +120,7 @@ For information on using Enhanced Skins & Icon Packs, see: xref:enhanced-skins-a [[additions]] == Additions -{productname} also includes the following addition: +{productname} {release-version} also includes the following addition: === // #TINY-vwxyz1 @@ -128,7 +131,7 @@ For information on using Enhanced Skins & Icon Packs, see: xref:enhanced-skins-a [[changes]] == Changes -{productname} also includes the following change: +{productname} {release-version} also includes the following change: === // #TINY-vwxyz1 @@ -139,7 +142,7 @@ For information on using Enhanced Skins & Icon Packs, see: xref:enhanced-skins-a [[removed]] == Removed -{productname} also includes the following removal: +{productname} {release-version} also includes the following removal: === // #TINY-vwxyz1 @@ -150,7 +153,7 @@ For information on using Enhanced Skins & Icon Packs, see: xref:enhanced-skins-a [[bug-fixes]] == Bug fixes -{productname} also includes the following bug fix: +{productname} {release-version} also includes the following bug fix: === // #TINY-vwxyz1 @@ -161,7 +164,7 @@ For information on using Enhanced Skins & Icon Packs, see: xref:enhanced-skins-a [[security-fixes]] == Security fixes -{productname} includes : +{productname} {release-version} includes : === // #TINY-vwxyz1 @@ -172,7 +175,7 @@ For information on using Enhanced Skins & Icon Packs, see: xref:enhanced-skins-a [[deprecated]] == Deprecated -{productname} includes the following deprecation: +{productname} {release-version} includes the following deprecation: === The `` configuration property, ``, has been deprecated @@ -182,9 +185,9 @@ For information on using Enhanced Skins & Icon Packs, see: xref:enhanced-skins-a [[known-issues]] == Known issues -This section describes issues that users of {productname} may encounter and possible workarounds for these issues. +This section describes issues that users of {productname} {release-version} may encounter and possible workarounds for these issues. -There known issue in {productname} . +There known issue in {productname} {release-version}. === // #TINY-vwxyz1 diff --git a/-new-material-templates/release-notes-template/ROOT/partials/misc/supported-versions.adoc b/-new-material-templates/release-notes-template/ROOT/partials/misc/supported-versions.adoc deleted file mode 100644 index cce8334762..0000000000 --- a/-new-material-templates/release-notes-template/ROOT/partials/misc/supported-versions.adoc +++ /dev/null @@ -1,32 +0,0 @@ -[[supported-tinymce-versions]] -== Supported {productname} versions - -Supported versions of {productname}: - -[cols="^,^,^",options="header"] -|=== -|Version |Release Date |End of Support -// add new row with version, release date, and end-of-support date. -// use the internal spreadsheet to calculate the end-of-support date from the release date. -|6.6 |2023-07-19 |2025-01-19 -|6.5 |2023-06-21 |2024-12-21 -|6.4 |2023-03-29 |2024-09-29 -|6.3 |2022-12-08 |2024-06-08 -|6.2 |2022-09-26 |2024-03-26 -|6.1 |2022-07-13 |2024-01-13 -|6.0 |2022-04-07 |2023-10-07 -|=== - - - - - -To view our Software License Agreements, visit: - -* link:{legalpages}/cloud-use-subscription-agreement/[The {cloudname} Services Subscription Agreement]. -* link:{legalpages}/tiny-self-hosted-enterprise-agreement/[The {companyname} Self-Hosted Software License Agreement - (Enterprise Users)]. -* link:{legalpages}/tiny-self-hosted-oem-saas-agreement/[The {companyname} Self-Hosted Software License Agreement - (OEM & SaaS Users)]. - -Support for Partner Plugins is provided by Partner companies and is not the responsibility of {companynameformal}. For information on Partner Plugins, see: link:{companyurl}/partners/[https://www.tiny.cloud/partners/]. - -// This file is instructional and is never included in the published name-space. diff --git a/-new-material-templates/release-notes-template/antora.yml b/-new-material-templates/release-notes-template/antora.yml deleted file mode 100644 index f382848b8e..0000000000 --- a/-new-material-templates/release-notes-template/antora.yml +++ /dev/null @@ -1,83 +0,0 @@ -name: tinymce -title: TinyMCE Documentation -# update the version value if required. Almost certainly *not* required. -version: '6' -asciidoc: - attributes: - # anchor configuration (the @ allows it to be overridden if required) - idprefix: '@' - idseparator: '-@' - # generic variables - companyurl: https://www.tiny.cloud - cdnurl: https://cdn.tiny.cloud/1/no-api-key/tinymce/7/tinymce.min.js - tdcdnurl: https://cdn.tiny.cloud/1/_your_api_key_/tinydrive/7/tinydrive.min.js - tinymce_live_demo_url: https://cdn.tiny.cloud/1/qagffr3pkuv17a8on1afax661irst1hbr4e6tbv888sz91jc/tinymce/7/tinymce.min.js - tinydrive_live_demo_url: https://cdn.tiny.cloud/1/qagffr3pkuv17a8on1afax661irst1hbr4e6tbv888sz91jc/tinydrive/7/tinydrive.min.js - webcomponent_url: https://cdn.jsdelivr.net/npm/@tinymce/tinymce-webcomponent@2/dist/tinymce-webcomponent.min.js - jquery_url: https://cdn.jsdelivr.net/npm/@tinymce/tinymce-jquery@2/dist/tinymce-jquery.min.js - default_meta_keywords: tinymce, documentation, docs, plugins, customizable skins, configuration, examples, html, php, java, javascript, image editor, inline editor, distraction-free editor, classic editor, wysiwyg - # product variables - productname: TinyMCE - productmajorversion: 6 - # update the productminorversion value if required. Likely required. - # Note: this value is not changed for .z updates. - # For example, an update from 6.6.0 to 6.6.1 does not require a change to this variable’s value. - productminorversion: '6.6' - ##### product name in codeblock - prodnamecode: tinymce - #### more names - companyname: Tiny - companynameformal: Tiny Technologies, Inc. - cloudname: Tiny Cloud - cloudfilemanager: Tiny Drive - enterpriseversion: TinyMCE Enterprise - communityname: TinyMCE Community - accountpage: Tiny Account - supportname: Tiny Support - betaprogram: Tiny Insights Program - #### some plugin names - prem_skins_icons: Enhanced Skins & Icon Packs - #### Plan names - tieroneplan: Tiny Cloud Core Plan - tiertwoplan: Tiny Cloud Essential Plan - tierthreeplan: Tiny Cloud Professional Plan - enterpriseplan: Tiny Custom Plans - ## common tiny.cloud URLs - supporturl: https://support.tiny.cloud - plugindirectory: https://www.tiny.cloud/tinymce/features/ - gettiny: https://www.tiny.cloud/get-tiny - blogurl: https://www.tiny.cloud/blog - download-community: https://www.tiny.cloud/get-tiny/self-hosted/ - download-enterprise: https://www.tiny.cloud/my-account/downloads/ - accountpageurl: https://www.tiny.cloud/my-account - accountkeyurl: https://www.tiny.cloud/my-account/key-manager/ - accountjwturl: https://www.tiny.cloud/my-account/jwt/ - accountsignup: https://www.tiny.cloud/auth/signup - pricingpage: https://www.tiny.cloud/pricing - contactpage: https://www.tiny.cloud/contact - legalpages: https://www.tiny.cloud/legal - communitysupporturl: https://stackoverflow.com/questions/tagged/tinymce - betaprogramurl: https://www.tiny.cloud/insights-program/ - # plugin-specific tiny.cloud URLs - aipricingurl: https://www.tiny.cloud/tinymce/features/ai-integration/ - revisionhistorypricingurl: https://www.tiny.cloud/tinymce/features/revision-history/ - importwordpricingurl: https://www.tiny.cloud/tinymce/features/import-from-word/ - exportwordpricingurl: https://www.tiny.cloud/tinymce/features/export-word/ - exportpdfpricingurl: https://www.tiny.cloud/tinymce/features/export-pdf/ - # HTML entities - tick: '✔' - cross: '✖' - tab: '  ' - newline: '
' - virt_ellps: '⋮' - ellps: '…' - # Demo logos - logofordemos: 'https://www.tiny.cloud/docs/images/logos/android-chrome-256x256.png' - logofordemoshtml: '

TinyMCE Logo

' - logofordemoshtmlright: '

TinyMCE Logo

' - -nav: -- modules/ROOT/nav.adoc -- modules/ROOT/moxiedoc_nav.adoc - -# This file is instructional and is never included in the published name-space. diff --git a/.api-version b/.api-version index 4b49d9bb63..468c41f93c 100644 --- a/.api-version +++ b/.api-version @@ -1 +1 @@ -7.2.0 \ No newline at end of file +7.2.1 \ No newline at end of file diff --git a/antora-playbook-local.yml b/antora-playbook-local.yml index 4abf519a19..3f6ce3c0fe 100644 --- a/antora-playbook-local.yml +++ b/antora-playbook-local.yml @@ -12,7 +12,8 @@ urls: latest_version_segment: latest ui: bundle: - url: https://tiny-cloud-docs-antora-themes-staging.s3.amazonaws.com/ui-bundle.zip + url: https://tiny-cloud-docs-antora-themes-production.s3.amazonaws.com/ui-bundle.zip + snapshot: true asciidoc: extensions: - '@tinymce/antora-extension-livedemos' diff --git a/antora-playbook.yml b/antora-playbook.yml index 0cc29750e2..c5fc872959 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -14,7 +14,8 @@ urls: latest_version_segment: latest ui: bundle: - url: https://tiny-cloud-docs-antora-themes-staging.s3.amazonaws.com/ui-bundle.zip + url: https://tiny-cloud-docs-antora-themes-production.s3.amazonaws.com/ui-bundle.zip + snapshot: true asciidoc: extensions: - '@tinymce/antora-extension-livedemos' diff --git a/antora.yml b/antora.yml index 01f14f3473..a2461636df 100644 --- a/antora.yml +++ b/antora.yml @@ -15,7 +15,7 @@ asciidoc: webcomponent_url: https://cdn.jsdelivr.net/npm/@tinymce/tinymce-webcomponent@2/dist/tinymce-webcomponent.min.js jquery_url: https://cdn.jsdelivr.net/npm/@tinymce/tinymce-jquery@2/dist/tinymce-jquery.min.js openai_proxy_url: https://openai.ai-demo-proxy.tiny.cloud/v1/chat/completions - openai_proxy_token: eyJhbGciOiJFUzM4NCJ9.eyJhdWQiOlsiaHR0cHM6Ly9vcGVuYWkuYWktZGVtby1wcm94eS50aW55LmNsb3VkLyJdLCJleHAiOjE3MTk3NTYwMDAsImh0dHBzOi8vb3BlbmFpLmFpLWRlbW8tcHJveHkudGlueS5jbG91ZC9yb2xlIjoicHVibGljLWRlbW8iLCJpc3MiOiJodHRwczovL2FpLWRlbW8tcHJveHkudGlueS5jbG91ZC8iLCJqdGkiOiJlYWU5MjBhMy05ZGQ0LTRkZjUtYTM4Yy04ODY5ZTJkZGIwYTQiLCJzdWIiOiJhaS1hc3Npc3RhbnQtZGVtbyJ9.hX44J5hPOCLOidK8mBAcnlAVh-ae4nVTq3W92xRLuGiF_4mGZWn1W3Ihgd7unlffz7GDayGxD_3hoQx8f64bTJg5hyHjwjKH1AZj1EKRal-NCNbqmoUa0TOm6_VXpRl2 + openai_proxy_token: eyJhbGciOiJFUzM4NCJ9.eyJhdWQiOlsiaHR0cHM6Ly9vcGVuYWkuYWktZGVtby1wcm94eS50aW55LmNsb3VkLyJdLCJleHAiOjE3MzMwMTEyMDAsImh0dHBzOi8vb3BlbmFpLmFpLWRlbW8tcHJveHkudGlueS5jbG91ZC9yb2xlIjoicHVibGljLWRlbW8iLCJpc3MiOiJodHRwczovL2FpLWRlbW8tcHJveHkudGlueS5jbG91ZC8iLCJqdGkiOiIyMmM0MjBkNy1hNjVmLTQ3NDQtODEwZS1jZWY3ZDY2ODQ1ZGYiLCJzdWIiOiJhaS1hc3Npc3RhbnQtZGVtbyJ9.H0MgAgu6EUFLO2zx6fnsnmCMw_0MWtc3Ne4ue6N_CFAowPkIjBqr022ypJqj5i3FMJNad5cWYj84jKKfPHTUaFN5RNurl09K2SDnY2OqNnhcXOT9rl3owhrGxgODOR9G default_meta_keywords: tinymce, documentation, docs, plugins, customizable skins, configuration, examples, html, php, java, javascript, image editor, inline editor, distraction-free editor, classic editor, wysiwyg # product docker variables dockerimageimportfromwordexporttoword: registry.containers.tiny.cloud/docx-converter-tiny @@ -26,7 +26,7 @@ asciidoc: # product variables productname: TinyMCE productmajorversion: 7 - productminorversion: '7.0' + productminorversion: '7.2' ##### product name in codeblock prodnamecode: tinymce #### more names diff --git a/modules/ROOT/examples/live-demos/spellchecker/index.js b/modules/ROOT/examples/live-demos/spellchecker/index.js index 6ccd6f0d1c..617b1a579d 100644 --- a/modules/ROOT/examples/live-demos/spellchecker/index.js +++ b/modules/ROOT/examples/live-demos/spellchecker/index.js @@ -3,7 +3,7 @@ tinymce.init({ plugins: 'code tinymcespellchecker link', toolbar: 'spellchecker language spellcheckdialog', height: 500, - spellchecker_language: 'en', + spellchecker_language: 'en_US', content_langs: [ { title: 'Afrikaans (South Africa)', code: 'af_ZA', customCode: 'af_ZA' }, { title: 'English (Australia)', code: 'en_AU' }, diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc index acde2897f3..c3c56efb9d 100644 --- a/modules/ROOT/nav.adoc +++ b/modules/ROOT/nav.adoc @@ -311,10 +311,13 @@ **** xref:mediaembed-server-integration.adoc[Integrate Enhanced Media Embed Server] *** xref:advtable.adoc[Enhanced Tables] *** xref:exportpdf.adoc[Export to PDF] +**** xref:html-to-pdf-converter-api.adoc[HTML to PDF Converter API] *** xref:exportword.adoc[Export to Word] +**** xref:html-to-docx-converter-api.adoc[HTML to DOCX Converter API] *** xref:footnotes.adoc[Footnotes] *** xref:formatpainter.adoc[Format Painter] *** xref:importword.adoc[Import from Word] +**** xref:docx-to-html-converter-api.adoc[DOCX to HTML Converter API] *** xref:editimage.adoc[Image Editing] *** xref:inline-css.adoc[Inline CSS] *** xref:linkchecker.adoc[Link Checker] @@ -411,6 +414,9 @@ **** xref:7.3-release-notes.adoc#improvements[Improvements] **** xref:7.3-release-notes.adoc#additions[Additions] **** xref:7.3-release-notes.adoc#bug-fixes[Bug fixes] +*** {productname} 7.2.1 +**** xref:7.2.1-release-notes.adoc#overview[Overview] +**** xref:7.2.1-release-notes.adoc#bug-fixes[Bug fixes] *** {productname} 7.2 **** xref:7.2-release-notes.adoc#overview[Overview] **** xref:7.2-release-notes.adoc#accompanying-premium-self-hosted-server-side-component-changes[Accompanying Premium self-hosted server-side component changes] diff --git a/modules/ROOT/pages/7.0-release-notes.adoc b/modules/ROOT/pages/7.0-release-notes.adoc index 6585b4dda3..99f52461d6 100644 --- a/modules/ROOT/pages/7.0-release-notes.adoc +++ b/modules/ROOT/pages/7.0-release-notes.adoc @@ -543,9 +543,9 @@ Previously, the bespoke `styles` select toolbar button in {productname} defaulte === Removed `force_hex_color` option, with the default now being all colors are forced to HEX format and as lower case. // #TINY-10436 -Previously in {productname} 6, all colors in the content HTML were set to use `rgb` values by default. As the common practice is using `hex` values this change has been **reverted**. +Previously in {productname} 6, all colors in the content HTML were set to use `rgb` values by default. As the common practice is using `hex` values, this change has been **reverted**. -As a result, in {productname} 7, all colors are converted to use `hex` values and the `forced_hex_color` option is removed. The exception being `rgba` color values, they are left as is. +As a result, in {productname} 7, only RGB values in absolute value like `rgb(255, 255, 255)` are converted to HEX values. Other RGB formats such as those with non-absolute values, and color options such as RGBA and HSL remain unchanged. The `forced_hex_color` option has been removed. For more information, see xref:migration-from-6x.adoc#force-hex-color[Migrating from {productname} 6 to {productname} 7]. diff --git a/modules/ROOT/pages/7.2.1-release-notes.adoc b/modules/ROOT/pages/7.2.1-release-notes.adoc new file mode 100644 index 0000000000..da60dc9cc3 --- /dev/null +++ b/modules/ROOT/pages/7.2.1-release-notes.adoc @@ -0,0 +1,84 @@ += {productname} {release-version} +:release-version: 7.2.1 +:navtitle: {productname} {release-version} +:description: Release notes for {productname} {release-version} +:keywords: releasenotes, new, changes, bugfixes +:page-toclevels: 1 + +include::partial$misc/admon-releasenotes-for-stable.adoc[] + + +[[overview]] +== Overview + +{productname} {release-version} was released for {enterpriseversion} and {cloudname} on Wednesday, July 3^rd^, 2024. These release notes provide an overview of the changes for {productname} {release-version}, including: + +* xref:bug-fixes[Bug fixes] + + +[[bug-fixes]] +== Bug fixes + +{productname} {release-version} also includes the following bug fixes: + +=== Text content could move unexpectedly when deleting a paragraph. +// #TINY-10590 + +Previously, pressing backspace within specific block elements could cause the HTML structure to change unexpectedly. This issue arose because pressing the backspace key would merge content before and after a tag boundary, leading to unintended restructuring of elements within a `+
+`. + +.Example of Original Content Structure +[source, html] +---- +
Hi ,

Thank you for contacting support.
+

Pasted text.

+

Best regards.
+
Bli ,

Thank you for contacting support.
+

Pasted text.

+

Best regards.
+---- + +after pressing backspace, the content was merged into a single `+
+`, which resulted in a disrupted layout and structure such as the below. + +.Example of Unintended Merged Content Structure After Pressing Backspace +[source, html] +---- +
+

Pasted text.Hi ,

Thank you for contacting support.

+

Best regards.
+
Bli ,

Thank you for contacting support.
+

Pasted text.

+

Best regards.
+---- + +As a consequence, the content before the `+

+` tag was merged into the `+

+` tag. + +In {productname} {release-version}, this issue has been addressed by preventing the merging of content across tag boundaries, ensuring the intended HTML structure is maintained. In addition to this change, adjustments were made to handle line breaks more effectively. + +As a result, pressing backspace no longer reduces the number of `+
+` tags before `+

+` tag, such as "Best regards," preserving the original HTML layout. + +=== Long translations of the bottom help text would cause minor graphical issues. +// #TINY-10961 + +Previously, resizing the editor caused the statusbar to render the help text incorrectly if it was too long. This was particularly problematic for long translations, as the statusbar did not handle extended text properly, leading to visual misalignment and hiding important elements. + +To fix this, the statusbar's CSS was updated to handle this by retaining the help text on one line and hiding any overflowing text. + +As a result, the help text now overflows without disrupting the statusbar layout, ensuring a consistent appearance and visibility. + +=== Open Link button was disabled when selection partially covered a link or when multiple links were selected. +// #TINY-11009 + +Previously, the “Open link” toolbar button and menu item were disabled when a link was partially selected or when the selection included multiple links. + +{productname} {release-version} addresses this issue. Now, the "Open link" toolbar button and menu item are enabled when any part of a link or multiple links are within the selection. + +=== Cursor would shift to the start of the editor body when focus was shifted to a noneditable cell of a table. +// #TINY-10127 + +Previously in {productname}, when the editor did not have focus and a non-editable cell of a table was clicked, the selection was set to the non-editable cell of the table instead of the offscreen element. + +As a consequence, placing the selection on the non-editable cell caused the cursor to be incorrectly placed in the editor body and unexpectedly scroll to the top of the editor. + +In {productname} {release-version}, the selection handling logic has been updated. Now, the selection is maintained on the offscreen div when necessary to prevent the selection from being changed. + +As a result, the selection correctly shifts to the offscreen element when required, maintaining the cursor position and no longer causing the editor to scroll unexpectedly. \ No newline at end of file diff --git a/modules/ROOT/pages/changelog.adoc b/modules/ROOT/pages/changelog.adoc index 32eb680e46..819cb9b9ac 100644 --- a/modules/ROOT/pages/changelog.adoc +++ b/modules/ROOT/pages/changelog.adoc @@ -36,6 +36,18 @@ NOTE: This is the {productname} Community version changelog. For information abo * Colorpicker's hex-based input field showed the wrong validation error message. // #TINY-11115 +== 7.2.1 - 2024-07-03 + +=== Fixed +* Text content could move unexpectedly when deleting a paragraph. +// #TINY-10590 +* Cursor would shift to the start of the editor body when focus was shifted to a noneditable cell of a table. +// #TINY-10127 +* Long translations of the bottom help text would cause minor graphical issues. +// #TINY-10961 +* Open Link button was disabled when selection partially covered a link or when multiple links were selected. +// #TINY-11009 + == 7.2.0 - 2024-06-19 === Added diff --git a/modules/ROOT/pages/content-formatting.adoc b/modules/ROOT/pages/content-formatting.adoc index ef133a3f01..bd4f7fd81b 100644 --- a/modules/ROOT/pages/content-formatting.adoc +++ b/modules/ROOT/pages/content-formatting.adoc @@ -7,5 +7,3 @@ include::partial$configuration/formats.adoc[] include::partial$configuration/format_empty_lines.adoc[] include::partial$configuration/format_noneditable_selector.adoc[] - -include::partial$configuration/force_hex_color.adoc[] diff --git a/modules/ROOT/pages/docx-to-html-converter-api.adoc b/modules/ROOT/pages/docx-to-html-converter-api.adoc new file mode 100644 index 0000000000..cb2a034337 --- /dev/null +++ b/modules/ROOT/pages/docx-to-html-converter-api.adoc @@ -0,0 +1,53 @@ += Docx to HTML Converter API +:navtitle: Docx to HTML Converter API +:description: The DOCX to HTML converter provides an API for converting Microsoft Word .docx and .dotx files to HTML, allowing users to import content from Word documents directly into their web applications. +:description_short: The DOCX to HTML converter provides an API for converting Microsoft Word .docx and .dotx files to HTML. +:keywords: service, exportword, export to docx, export to word, html to docx converter api +:pluginname: Import from Word +:servicename: Docx to HTML Converter API + +[NOTE] +This is a premium feature. link:https://www.tiny.cloud/contact/[Contact us] to purchase a license or to learn more about our tailored offers. Note that any documents generated without authentication will be watermarked. + +== Overview + +The {servicename} provides an API for converting Microsoft Word `.docx` and `.dotx` files to HTML, allowing users to import content from Word documents directly into their web applications. This feature ensures that the imported content retains its original formatting, making it an essential tool for users who require high fidelity in document conversion. + +== Key Features + +* **High Fidelity Conversion**: Ensures that the content from Word documents is imported with accurate formatting, including styles, lists, tables, images, and hyperlinks. +* **Seamless Integration**: Easily integrates with a WYSIWYG editor, allowing users to convert Word documents directly within their existing content management workflows. +* **API Accessibility**: Accessible via a simple REST API, making it easy to incorporate into various applications and services. +* **Support for Complex Documents**: Handles complex Word documents with multiple sections, headers, footers, and different page layouts. +* **Customization Options**: Provides options to customize the conversion process to meet specific needs. + +[[options]] +== Flexible Configuration Options + +=== Formatting Customization + +* **Custom CSS**: Apply custom CSS to the converted content for consistent styling. +* **Formatting**: Allows which Word styles and formatting are output alongside the document. +* **Document properties**: Set document size and margins in pixels. + +=== Output Options + +* **Output Format**: Content is returned as a JSON object for easier integration into applications such as: +** **HTML Content**: Provides the converted HTML, ready for web use. +** **Document Information**: Offers document size and margin details for precise layout control. + +These configuration options enhance the flexibility and control users have over the import process, making it adaptable to various needs and use cases. + +[[ideal-use-cases]] +== Ideal for Various Use Cases + +* **Corporate Documentation**: Organizations can seamlessly import Word documents into their web-based content management systems, preserving formatting and styles. +* **Academic Publishing**: Researchers and educators can easily convert and publish their Word documents on educational platforms or academic journals' websites. +* **Legal Document Management**: Law firms can streamline the review and editing of Word documents while preserving essential formatting elements. +* **Content Creation and Blogging**: Bloggers can import their drafts directly into their blogging platform, saving time on reformatting. +* **Online Learning Platforms**: Instructors can import educational materials directly from Word, improving the learning experience for students. +* **Government and Public Services**: Government agencies can import documents into their web platforms, ensuring they are accessible in a consistent and professional manner. + +== Docx to HTML Converter API Reference + +> Explore the comprehensive API documentation at link:https://exportdocx.converter.tiny.cloud/docs#section/Import-from-Word[Docx to HTML Converter API Reference documentation.^] \ No newline at end of file diff --git a/modules/ROOT/pages/events.adoc b/modules/ROOT/pages/events.adoc index 3cdb272aa1..abe61a14af 100644 --- a/modules/ROOT/pages/events.adoc +++ b/modules/ROOT/pages/events.adoc @@ -2,15 +2,42 @@ :navtitle: Available Events :description_short: List of common editor events :description: List of common editor events -:keywords: Click, DblClick, MouseDown, MouseUp, MouseMove, MouseOver, MouseOut, MouseEnter, MouseLeave, KeyDown, KeyPress, KeyUp, ContextMenu, Paste, Init, Focus, Blur, BeforeSetContent, SetContent, GetContent, PreProcess, PostProcess, NodeChange, Undo, Redo, Change, Dirty, Remove, ExecCommand, PastePreProcess, PastePostProcess, AutocompleterStart, AutocompleterUpdate, AutocompleterEnd - -{productname} supports some browser-native events, and provides additional events for working with the editor and plugins. +:keywords: Click, DblClick, MouseDown, MouseUp, MouseMove, MouseOver, MouseOut, MouseEnter, MouseLeave, KeyDown, KeyPress, KeyUp, ContextMenu, Paste, Init, Focus, Blur, BeforeSetContent, SetContent, GetContent, PreProcess, PostProcess, NodeChange, Undo, Redo, Change, Dirty, Remove, ExecCommand, PastePreProcess, PastePostProcess, AutocompleterStart, AutocompleterUpdate, AutocompleterEnd, setup, init, init_instance_callback, AddEditor, RemoveEditor, BeforeUnload, browser-native events, editor-core events, plugin events, editor-manager events, event handlers, event binding +[[handling-editor-events]] == Handling Editor events -The following examples illustrate how to use supported native events, editor core events, and plugin events with {productname}. +{productname} supports several types of events for working with the editor and plugins. + +* xref:browser-native-events[Supported browser-native events] +* xref:editor-core-events[Editor core events] +* xref:plugin-events[Plugin events] +* xref:editor-manager-events[Editor Manager events] + +The following examples illustrate how to use supported native events, editor core events, and plugin events with {productname}. Editor Manager events are handled separately using `+tinymce.on+`, rather than `+editor.on+`. + +=== Defining an event handler + +Event handlers can be initialized anywhere using the `+editor.on+` method, as shown in the following example: + +[source,js] +---- +tinymce.activeEditor.on('click', (e) => { + console.log('Editor was clicked at: ' + e.pageX + ', ' + e.pageY); +}); +---- + +=== `+setup+` and `+init_instance_callback+` options + +A common use case for setting up events is to use the `+setup+` and `+init_instance_callback+` options. These options allow you to bind events before and after the editor instance is initialized. + +The `+setup+` option can be used to bind an event **before** the editor instance is initialized. + +The `+init_instance_callback+` option can be used to bind an event **after** the editor instance is initialized. + +TIP: The `+init_instance_callback+` is functionally equivalent to binding an event listener to the `init` event on the `+setup+` option. -The following example uses a function to create a console log entry when the editor has initialized. This is also an example of handling an event which does not return any data. +For example, the following code: [source,js] ---- @@ -18,13 +45,45 @@ tinymce.init({ selector: 'textarea', setup: (editor) => { editor.on('init', (e) => { - console.log('The Editor has initialized.'); + console.log('Editor is initialized.'); }); } }); ---- -The following example uses a function to create a console log entry when a command is executed in the editor. This is also an example of handling an event that returns data. +Is equivalent to: + +[source,js] +---- +tinymce.init({ + selector: 'textarea', + init_instance_callback: (editor) => { + console.log('Editor is initialized.'); + } +}); +---- + +For more information on these options, see xref:editor-important-options.adoc#setup[setup] and xref:editor-important-options.adoc#init_instance_callback[init_instance_callback]. + +=== Binding an event before editor initialization + +The following example uses the `+setup+` option to bind an event before the editor instance is initialized. This is an example of handling an event that does not return data, such as the `+ResizeEditor+` editor event. Therefore, the `+e+` parameter is not used. + +[source,js] +---- +tinymce.init({ + selector: 'textarea', + setup: (editor) => { + editor.on('ResizeEditor', (e) => { + console.log('Editor was resized.'); + }); + } +}); +---- + +=== Binding an event after editor initialization + +The following example uses the `+init_instance_callback+` option to bind an event after the editor instance is initialized. This is an example of handling an event that returns data, such as the `+ExecCommand+` event. Therefore, we can use the `+e+` parameter to access the data returned by the event. [source,js] ---- @@ -38,6 +97,7 @@ tinymce.init({ }); ---- +[[browser-native-events]] == Supported browser-native events {productname} supports the following browser-native events. Click the event name for details (links open https://developer.mozilla.org/[MDN Web Docs]). @@ -176,6 +236,7 @@ The following events are provided by the {productname} editor. |FontFamilyTextUpdate |`+{ value: string }+` |Fired after the visible text label of the `fontfamily` bespoke toolbar button is updated. `value` refers to the updated visible text label. |=== +[[plugin-events]] == Plugin events The following plugins provide events. diff --git a/modules/ROOT/pages/export-to-word-standalone-service.adoc b/modules/ROOT/pages/export-to-word-standalone-service.adoc new file mode 100644 index 0000000000..24d50e771c --- /dev/null +++ b/modules/ROOT/pages/export-to-word-standalone-service.adoc @@ -0,0 +1,5 @@ += Export to Word Standalone Service +:navtitle: Export to Word Standalone Service +:description: The Export to Word service feature, provides the ability to generate a .docx Word files directly without the need for an editor. +:description_short: Generate a Word file directly from standalone application. +:keywords: service, exportword, export to Word \ No newline at end of file diff --git a/modules/ROOT/pages/html-to-docx-converter-api.adoc b/modules/ROOT/pages/html-to-docx-converter-api.adoc new file mode 100644 index 0000000000..114db73d98 --- /dev/null +++ b/modules/ROOT/pages/html-to-docx-converter-api.adoc @@ -0,0 +1,44 @@ += HTML to Docx Converter API +:navtitle: Export to Word Standalone Service +:description: The Export to Microsoft Word feature collects the HTML generated with the tinymce.editor.getContent() method and combines it with the default editor content styles along with the styles provided in the configuration. +:description_short: Generate a .docx file directly from any application. +:keywords: service, exportword, export to docx, export to word, html to docx converter api +:pluginname: Export to Word +:servicename: HTML to Docx Converter API + +[NOTE] +This is a premium feature. link:https://www.tiny.cloud/contact/[Contact us] to purchase a license or to learn more about our tailored offers. Note that any documents generated without authentication will be watermarked. + +== Overview + +The {servicename} allows developers to convert HTML content into DOCX files seamlessly. It is designed to integrate effortlessly into your applications, providing high-quality document conversions with ease. + +== Key Features + +- **HTML to DOCX Conversion**: Transform HTML content into DOCX files with precision, maintaining the structure and styling. +- **Customizable Outputs**: Tailor the DOCX output to match your requirements, including custom headers, footers, and styles. +- **High Performance**: Engineered for efficiency, ensuring fast and reliable document conversions. +- **Ease of Integration**: Simple RESTful API interface that can be integrated into any application or workflow. + +[[options]] +== Flexible Configuration Options + +You can customize the DOCX output by specifying various options in your request: + +- **Headers and Footers**: Add custom headers and footers to your DOCX documents. +- **Styles**: Define custom styles for different HTML elements to ensure your documents look exactly as desired. +- **Page Format**: Select from a wide range of page formats, including Letter, Legal, Tabloid, and A4, ensuring your documents look perfect every time. + +== Ideal for Various Use Cases + +Examples on how you can use the API to convert an HTML document with custom styles and a header and footer. + +* **Legal Document Automation**: Automate the generation of legal documents by converting pre-defined HTML templates into standardized DOCX files, complete with custom headers, footers, and styling. +* **Dynamic Report Generation**: Generate dynamic reports from HTML data, allowing for consistent formatting and styling across all generated documents. +* **Educational Material Distribution**: Convert HTML-based educational content into DOCX files for easy distribution and offline access by students. +* **Newsletter Archiving**: Archive HTML newsletters as DOCX files, preserving the layout and design for future reference. + + +== HTML to Docx Converter API Reference + +> Explore the comprehensive API documentation at link:https://exportdocx.converter.tiny.cloud/docs#section/Export-to-Word[HTML to Docx Converter API Reference documentation.^] \ No newline at end of file diff --git a/modules/ROOT/pages/html-to-pdf-converter-api.adoc b/modules/ROOT/pages/html-to-pdf-converter-api.adoc new file mode 100644 index 0000000000..a566d242c9 --- /dev/null +++ b/modules/ROOT/pages/html-to-pdf-converter-api.adoc @@ -0,0 +1,43 @@ += HTML to PDF Converter API +:navtitle: Export to PDF Standalone Service +:description: The HTML to PDF Converter API service feature, provides the ability to generate a PDF files directly without the need for an editor. +:description_short: Generate a .pdf file directly from any application. +:keywords: service, exportpdf, export to pdf, HTML to PDF Converter API +:pluginname: Export to PDF +:servicename: HTML to PDF Converter API + +[NOTE] +This is a premium feature. link:https://www.tiny.cloud/contact/[Contact us] to purchase a license or to learn more about our tailored offers. Note that any documents generated without authentication will be watermarked. + +== Overview + +The {servicename} is a powerful tool that seamlessly integrates advanced document conversion capabilities into developers workflows. This API allows for the efficient conversion of HTML content into PDF documents, catering to a wide range of use cases. + +=== Key Features + +* **Versatile Document Conversion**: Convert HTML content into high-quality PDF documents, providing flexibility for various document needs. +* **Preprocessing Capabilities**: Pre-process content before conversion, such as resolving merge tags, ensuring fully customized and ready-to-use PDF documents. +* **Customizable Output**: Tailor the appearance and structure of the converted PDFs with customizable output xref:html-to-pdf-converter-api.adoc#options[options], including page sizes, margins, and formatting. +* **Scalability**: Handle large volumes of PDF documents with consistent performance and reliability, supporting business growth and varying demands. +* **Ease of Integration**: Integrate the API into existing workflows easily with comprehensive documentation and straightforward API endpoints. +* **Security and Compliance**: Ensure secure document conversion processes that adhere to data protection standards and industry regulations, crucial for handling sensitive information. + +[[options]] +== Flexible Configuration Options + +Tailor your PDF documents to suit your needs: + +* **Custom CSS Styling:** Apply link:https://exportpdf.converter.tiny.cloud/docs#section/General/CSS[custom CSS^] styles to your PDFs for brand consistency and enhanced presentation. +* **Header and Footer Options:** Add link:https://exportpdf.converter.tiny.cloud/docs#section/PDF-options/Header-and-footer[headers, footers^], and other branding elements to your PDF documents for a professional touch. +* **Page Formatting:** Control page settings such as orientation, link:https://exportpdf.converter.tiny.cloud/docs#section/PDF-options/Margins[margins^], and link:https://exportpdf.converter.tiny.cloud/docs#section/PDF-options/Page-format[page size] to optimize readability. + +== Ideal for Various Use Cases + +* **Aggregating Content from Multiple Sources**: Combine content from various editors into a single cohesive PDF document, simplifying content management for organizations using multiple tools. +* **Centralized Document Management**: Store generated PDF documents centrally for better organization and accessibility, facilitating team collaboration and efficient document retrieval. +* **Preprocessing and Customization**: Pre-process content to resolve merge tags and customize PDF document formatting, ensuring that the final output meets specific requirements and is ready for immediate use. +* **Large-Scale Document Processing**: Utilize the API’s scalability to handle large volumes of PDF documents, maintaining consistent performance and reliability, essential for growing businesses. + +== PDF Converter API Reference + +> Explore the comprehensive API documentation at link:https://exportpdf.converter.tiny.cloud/docs[PDF Converter API Reference documentation.^] \ No newline at end of file diff --git a/modules/ROOT/pages/import-from-word-standalone-service.adoc b/modules/ROOT/pages/import-from-word-standalone-service.adoc new file mode 100644 index 0000000000..13f01a683a --- /dev/null +++ b/modules/ROOT/pages/import-from-word-standalone-service.adoc @@ -0,0 +1,5 @@ += Import from Word Standalone Service +:navtitle: Import from Word Standalone Service +:description: The Import from Word service feature lets you import .docx (Word document) or .dotx (Word template) files into standalone application. +:description_short: Import a Word file directly into a standalone application while preserving formatting and rich media. +:keywords: service, importword, Import from Word \ No newline at end of file diff --git a/modules/ROOT/pages/importword.adoc b/modules/ROOT/pages/importword.adoc index d512b282fd..36e7bf33b2 100644 --- a/modules/ROOT/pages/importword.adoc +++ b/modules/ROOT/pages/importword.adoc @@ -33,8 +33,8 @@ For example: ---- tinymce.init({ selector: 'textarea', - plugins: 'code importword', - toolbar: 'importword code', + plugins: 'importword', + toolbar: 'importword', importword_service_url: '' }); ---- diff --git a/modules/ROOT/pages/introduction-to-tiny-spellchecker.adoc b/modules/ROOT/pages/introduction-to-tiny-spellchecker.adoc index 78c36aafe7..5d9cfa5fd6 100644 --- a/modules/ROOT/pages/introduction-to-tiny-spellchecker.adoc +++ b/modules/ROOT/pages/introduction-to-tiny-spellchecker.adoc @@ -29,7 +29,7 @@ With {cloudname} the server-side spellchecking component is automatically config tinymce.init({ selector: 'textarea', plugins: 'tinymcespellchecker', - spellchecker_language: 'en' + spellchecker_language: 'en_US' }); ---- @@ -47,7 +47,7 @@ tinymce.init({ selector: 'textarea', plugins: 'tinymcespellchecker', spellchecker_rpc_url: 'localhost/ephox-spelling', - spellchecker_language: 'en' + spellchecker_language: 'en_US' }); ---- diff --git a/modules/ROOT/pages/mergetags.adoc b/modules/ROOT/pages/mergetags.adoc index a8ce2f9f15..d5b1a2fbf3 100644 --- a/modules/ROOT/pages/mergetags.adoc +++ b/modules/ROOT/pages/mergetags.adoc @@ -66,13 +66,13 @@ For example, a merge tag can be set to any available typeface, type-size, foregr + A selected merge tag can be changed to any other merge tag by using the {pluginname} toolbar menu button. -. Text that matches an existing merge tag will be recognised as a merge tag when it is pasted or otherwise inserted into a {productname} document. +. Text that matches an existing merge tag will be recognized as a merge tag when it is pasted or otherwise inserted into a {productname} document. + -Content containing the specified prefix and suffix, and matching a specified merge tag, will be inserted as a merge tag when pasted into the editor. For example, if `Sender.Firstname` is a merge tag value, and the merge tag prefix and suffix have their default values, adding the string, `{{Sender.FirstName}}`, to a {productname} document will result in the string automatically being recognised as a merge tag. +Content containing the specified prefix and suffix, and matching a specified merge tag, will be inserted as a merge tag when pasted into the editor. For example, if `Sender.Firstname` is a merge tag value, and the merge tag prefix and suffix have their default values, adding the string, `{{Sender.FirstName}}`, to a {productname} document will result in the string automatically being recognized as a merge tag. . {pluginname} can be nested within the `+mergetags_list+` option. + -The `+mergetags_list+` option allows for the specification of a nested menu item within the {pluginname} toolbar menu button. This option allows any number of nested menus and items for merge tag categorisation. +The `+mergetags_list+` option allows for the specification of a nested menu item within the {pluginname} toolbar menu button. This option allows any number of nested menus and items for merge tag categorization. == Styling Merge Tags @@ -126,4 +126,4 @@ include::partial$configuration/mergetags_list.adoc[leveloffset=+1] include::partial$misc/plugin-toolbar-button-id-boilerplate.adoc[] -include::partial$misc/plugin-menu-item-id-boilerplate.adoc[] +include::partial$misc/plugin-menu-item-id-boilerplate.adoc[] \ No newline at end of file diff --git a/modules/ROOT/pages/migration-from-6x.adoc b/modules/ROOT/pages/migration-from-6x.adoc index fa32c032e7..f28052f085 100644 --- a/modules/ROOT/pages/migration-from-6x.adoc +++ b/modules/ROOT/pages/migration-from-6x.adoc @@ -125,19 +125,33 @@ This change does not impact editors using inline mode. [[force-hex-color]] ==== `force_hex_color` -Previously in {productname} 6, all colors in the content HTML were set to use `rgb` values by default. As the common practice is using `hex` values this change has been reverted. +Previously in {productname} 6, all colors in the content HTML were set to use `rgb` values by default. As the common practice is using `hex` values, this change has been reverted. .Example [source, html] ---- - + +// RGB value

Hello red color

- - +// RGBA value +

Hello red color

+// HSL value +

Hello red color

+// RGB value with alpha parameter +

Hello red color

+// RGB value with calculation +

Hello red color

+ +

Hello red color

+

Hello red color

+

Hello red color

+// non-absolute values and absolute values with calculation will not be converted to HEX color +

Hello red color

+

Hello red color

---- -In {productname} 7.0, all colors (excluding `rgba` values) are converted to use `hex` values and the `forced_hex_color` option has been removed. +In {productname} 7.0, only RGB values in absolute value like `rgb(255, 255, 255)` are converted to HEX values. Other RGB formats such as those with non-absolute values, and color options such as RGBA and HSL remain unchanged. The `forced_hex_color` option has been removed. [[plugins]] == Plugins diff --git a/modules/ROOT/pages/release-notes.adoc b/modules/ROOT/pages/release-notes.adoc index 89da321b30..2fd7890c7a 100644 --- a/modules/ROOT/pages/release-notes.adoc +++ b/modules/ROOT/pages/release-notes.adoc @@ -15,13 +15,18 @@ xref:7.3-release-notes.adoc#overview[{productname} 7.3] Release notes for {productname} 7.3 +a| +[.lead] +xref:7.2.1-release-notes.adoc#overview[{productname} 7.2.1] + +Release notes for {productname} 7.2.1 + a| [.lead] xref:7.2-release-notes.adoc#overview[{productname} 7.2] Release notes for {productname} 7.2 - a| [.lead] xref:7.1.2-release-notes.adoc#overview[{productname} 7.1.2] @@ -52,14 +57,7 @@ xref:7.0-release-notes.adoc#overview[{productname} 7.0] Release notes for {productname} 7.0 -// Dummy table cell. -// 1. When the number of cells in the table is odd: -// * remove the inline comment markup pre-pending this -// element. -// -// 2. When the number of cells in the table is even: -// * prepend the inline comment markup to this -// element. +// Uncomment this dummy cell when the number of cells above is odd to ensure the table renders correctly. a| |=== diff --git a/modules/ROOT/pages/wordpress.adoc b/modules/ROOT/pages/wordpress.adoc index daaae0703c..dea3255600 100644 --- a/modules/ROOT/pages/wordpress.adoc +++ b/modules/ROOT/pages/wordpress.adoc @@ -20,5 +20,4 @@ https://wordpress.org/plugins/tinymce-advanced/[Advanced Editor Tools] is a Word For details, visit: -* https://wordpress.org/plugins/tinymce-advanced/[WordPress.org Plugins - Advanced Editor Tools]. -* link:{blogurl}/how-to-use-tinymce-premium-plugins-in-wordpress-5[{companyname} Blog - How to use TinyMCE premium plugins in WordPress 5]. +* https://wordpress.org/plugins/tinymce-advanced/[WordPress.org Plugins - Advanced Editor Tools]. \ No newline at end of file diff --git a/modules/ROOT/partials/configuration/exportpdf.adoc b/modules/ROOT/partials/configuration/exportpdf.adoc index 981c7e1198..51183cb930 100644 --- a/modules/ROOT/partials/configuration/exportpdf.adoc +++ b/modules/ROOT/partials/configuration/exportpdf.adoc @@ -1,9 +1,12 @@ [[exportpdf-service-url]] == `exportpdf_service_url` -The {pluginname} uses the {productname} Cloud Services HTML to PDF converter service to generate the `document-name.pdf` files. +The {pluginname} uses the HTML to PDF converter service to generate the `document-name.pdf` files. -NOTE: The {pluginname} feature is currently only available `on-premise` and requires the `exportpdf_service_url` option to be configured. https://www.tiny.cloud/contact/[Contact us] if you require this feature. +The {pluginname} feature is currently only available exclusively for `on-premise` setups, requiring a self-hosted HTML to PDF converter service and the `exportpdf_service_url` option to be properly configured. If you require access to this feature, please link:https://www.tiny.cloud/contact/[contact us]. Refer to our xref:individual-export-to-pdf-on-premises.adoc[on-premises documentation] for detailed instructions on deploying the {pluginname} service server-side component using Docker. + +[TIP] +Update the `exportpdf_service_url` configuration in your {productname} setup to point to your host. For instance, if your host is `mycustomhost.com`, the URL will be `https://mycustomhost.com/v1/convert`. *Type:* `+String+` diff --git a/modules/ROOT/partials/configuration/exportword.adoc b/modules/ROOT/partials/configuration/exportword.adoc index 5d38e94c2b..ca51360cdd 100644 --- a/modules/ROOT/partials/configuration/exportword.adoc +++ b/modules/ROOT/partials/configuration/exportword.adoc @@ -1,7 +1,10 @@ [[exportword-service-url]] == `exportword_service_url` -The {pluginname} uses the {productname} Cloud Services HTML to DOCX converter service to generate the Word files. +The {pluginname} uses the HTML to DOCX converter service to generate the Word files. + + +The {pluginname} feature is currently only available exclusively for `on-premise` setups, requiring a self-hosted HTML to DOCX converter service and the `exportword_service_url` option to be properly configured. If you require access to this feature, please link:https://www.tiny.cloud/contact/[contact us]. Refer to our xref:individual-import-from-word-and-export-to-word-on-premises.adoc[on-premises documentation] for detailed instructions on deploying the {pluginname} service server-side component using Docker. NOTE: The {pluginname} feature is currently only available `on-premise` and requires the `exportword_service_url` option to be configured. link:https://www.tiny.cloud/contact/[Contact us] if you require this feature. diff --git a/modules/ROOT/partials/configuration/force_hex_color.adoc b/modules/ROOT/partials/configuration/force_hex_color.adoc deleted file mode 100644 index b46ab9677a..0000000000 --- a/modules/ROOT/partials/configuration/force_hex_color.adoc +++ /dev/null @@ -1,25 +0,0 @@ -[[force_hex_color]] -== `+force_hex_color+` - -This option allows the integrator to optionally force the conversion of either RGB or RGBA colors into HEX colors. - -*Type:* `+String+` - -*Default value:* `+'off'+` - -*Possible values:* `+'always'+`, `+'rgb_only'+`, `+'off'+` - -=== Example: using `+force_hex_color+` - -[source,js] ----- -// Output elements in XHTML style -tinymce.init({ - selector: 'textarea', // change this value according to your HTML - force_hex_color: 'always' -}); ----- - -* **force_hex_color: 'always'**: all colors are converted and applied as HEX format. -* **force_hex_color: 'rgb_only'**: only RGB and not RGBA colors are converted and applied as HEX. -* **force_hex_color: 'off'**: (default option) no conversion to hex is applied, and they are left as their input format. \ No newline at end of file diff --git a/modules/ROOT/partials/configuration/importword.adoc b/modules/ROOT/partials/configuration/importword.adoc index 54b0102a9e..95c51550e0 100644 --- a/modules/ROOT/partials/configuration/importword.adoc +++ b/modules/ROOT/partials/configuration/importword.adoc @@ -1,11 +1,12 @@ -[[importword-service-url-option]] -== `importword_service_url` option +[[importword-service-url]] +== `importword_service_url` -This option is used for setting the URL endpoint for the conversion service. +This option is used for setting the URL endpoint for the DOCX to HTML conversion service. -[IMPORTANT] -If this string value is **not configured** it will return a console.error: -_The {pluginname} plugin requires the `importword_service_url` to be configured_. If the editor detects an `invalid_URL`, it will return a console.error: _The value provided in `importword_service_url` is not a valid URL_. +The {pluginname} feature is currently only available exclusively for `on-premise` setups, requiring a self-hosted version of the DOCX to HTML conversion service and the `importword_service_url` option to be properly configured. If you require access to this feature, please link:https://www.tiny.cloud/contact/[contact us]. Refer to our xref:individual-import-from-word-and-export-to-word-on-premises.adoc[on-premises documentation] for detailed instructions on deploying the {pluginname} service server-side component using Docker. + +[TIP] +Update the `importword_service_url` configuration in your {productname} setup to point to your host. For instance, if your host is `mycustomhost.com`, the URL will be `https://mycustomhost.com/v1/convert`. *Type:* `+String+` @@ -15,8 +16,12 @@ _The {pluginname} plugin requires the `importword_service_url` to be configured_ ---- tinymce.init({ selector: 'textarea', - plugins: 'code importword', - toolbar: 'importword code', + plugins: 'importword', + toolbar: 'importword', importword_service_url: '' }); ----- \ No newline at end of file +---- + +[IMPORTANT] +If this string value is **not configured** it will return a console.error: +_The {pluginname} plugin requires the `importword_service_url` to be configured_. If the editor detects an `invalid_URL`, it will return a console.error: _The value provided in `importword_service_url` is not a valid URL_. \ No newline at end of file diff --git a/modules/ROOT/partials/configuration/mergetags_prefix.adoc b/modules/ROOT/partials/configuration/mergetags_prefix.adoc index 1030f12087..3b22e26659 100644 --- a/modules/ROOT/partials/configuration/mergetags_prefix.adoc +++ b/modules/ROOT/partials/configuration/mergetags_prefix.adoc @@ -19,6 +19,4 @@ tinymce.init({ toolbar: 'mergetags', mergetags_prefix: '{{' }); ----- - -IMPORTANT: Whatever character or characters are set as the Merge Tags prefix, it or they must be different to the characters set as the Merge Tags suffix. For example, if the Merge Tags prefix is set to `%`, the Merge Tags suffix cannot also be `%`. +---- \ No newline at end of file diff --git a/modules/ROOT/partials/configuration/mergetags_suffix.adoc b/modules/ROOT/partials/configuration/mergetags_suffix.adoc index dc041cf340..715e9c45c8 100644 --- a/modules/ROOT/partials/configuration/mergetags_suffix.adoc +++ b/modules/ROOT/partials/configuration/mergetags_suffix.adoc @@ -17,6 +17,4 @@ tinymce.init({ toolbar: 'mergetags', mergetags_suffix: '}}' }); ----- - -IMPORTANT: Whatever character or characters are set as the Merge Tags suffix, it or they must be different to the characters set as the Merge Tags prefix. For example, if the Merge Tags suffix is set to `%`, the Merge Tags prefix cannot also be `%`. +---- \ No newline at end of file diff --git a/modules/ROOT/partials/integrations/angular-quick-start.adoc b/modules/ROOT/partials/integrations/angular-quick-start.adoc index 90bd0a0615..76d2c8b6b4 100644 --- a/modules/ROOT/partials/integrations/angular-quick-start.adoc +++ b/modules/ROOT/partials/integrations/angular-quick-start.adoc @@ -1,6 +1,8 @@ :packageName: tinymce-angular -The https://github.com/tinymce/tinymce-angular[Official {productname} Angular component] integrates {productname} into Angular projects. This procedure creates a https://angular.io/guide/setup-local[basic Angular application] containing a {productname} editor. +The https://github.com/tinymce/tinymce-angular[Official {productname} Angular component] integrates {productname} into Angular projects. This procedure creates a https://angular.dev/tools/cli/setup-local[basic Angular application] containing a {productname} editor. + +This procedure uses standalone components. If using Angular Modules, see xref:angular-modules[Angular Modules]. For examples of the {productname} Angular integration, visit https://tinymce.github.io/tinymce-angular/[the tinymce-angular storybook]. @@ -45,44 +47,36 @@ ifeval::["{productSource}" != "package-manager"] npm install --save @tinymce/tinymce-angular ---- endif::[] -. Using a text editor, open `+/path/to/tinymce-angular-demo/src/app/app.module.ts+` and replace the contents with: -+ -[source,ts] ----- -import { BrowserModule } from '@angular/platform-browser'; -import { NgModule } from '@angular/core'; -import { EditorModule } from '@tinymce/tinymce-angular'; -import { AppComponent } from './app.component'; - -@NgModule({ - declarations: [ - AppComponent - ], - imports: [ - BrowserModule, - EditorModule - ], - providers: [], - bootstrap: [AppComponent] +. Using a text editor, open `+/path/to/tinymce-angular-demo/src/app/app.component.ts+` and replace the contents with: ++ +[source,ts,subs="attributes+"] +---- +import { Component } from '@angular/core'; +import { EditorComponent } from '@tinymce/tinymce-angular'; + +@Component({ + selector: 'app-root', + standalone: true, + imports: [EditorComponent], + template: ` +

{productname} {productmajorversion} Angular Demo

+ + ` }) -export class AppModule { } +export class AppComponent { + init: EditorComponent['init'] = { + plugins: 'lists link image table code help wordcount' + }; +} ---- -. Using a text editor, open `+/path/to/tinymce-angular-demo/src/app/app.component.html+` and replace the contents with: -+ -[source,tsx,subs="attributes+"] ----- -

{productname} {productmajorversion} Angular Demo

- ----- - ifeval::["{productSource}" == "cloud"] . Include the `+apiKey+` option in the editor element and include your link:{accountsignup}/[{cloudname} API key]. Such as: + [source,tsx] ---- - + ---- endif::[] ifeval::["{productSource}" == "package-manager"] @@ -96,17 +90,16 @@ ifeval::["{productSource}" == "package-manager"] ---- . Load TinyMCE. -* To load TinyMCE when the editor is initialized (also known as lazy loading), add a dependency provider to the module using the `+TINYMCE_SCRIPT_SRC+` token. +* To load {productname} when the editor is initialized (also known as lazy loading), add a dependency provider to the component using the `+TINYMCE_SCRIPT_SRC+` token. + [source,ts] ---- -import { EditorModule, TINYMCE_SCRIPT_SRC } from '@tinymce/tinymce-angular'; +import { EditorComponent, TINYMCE_SCRIPT_SRC } from '@tinymce/tinymce-angular'; /* ... */ -@NgModule({ +@Component({ /* ... */ - imports: [ - EditorModule - ], + standalone: true, + imports: [EditorComponent], providers: [ { provide: TINYMCE_SCRIPT_SRC, useValue: 'tinymce/tinymce.min.js' } ] @@ -123,12 +116,16 @@ import { EditorModule, TINYMCE_SCRIPT_SRC } from '@tinymce/tinymce-angular'; ---- .. Update the editor configuration to include the `+base_url+` and `+suffix+` options. + -[source,html] +[source,ts] ---- - +export class AppComponent { + /* ... */ + init: EditorComponent['init'] = { + /* ... */ + base_url: '/tinymce', // Root for resources + suffix: '.min' // Suffix to use when loading resources + }; +} ---- endif::[] ifeval::["{productSource}" == "zip"] @@ -143,8 +140,6 @@ To use an independent deployment of {productname}, add a script to either the `+ ---- + -To use an independent deployment of {productname} with the create a Angular application, add the script to `+/path/to/tinymce-angular-demo/src/app/app.component.html+`. -+ * Bundling {productname} with the Angular application using a module loader (such as Webpack). + -- @@ -174,7 +169,7 @@ endif::[] == Deploying the application to a HTTP server -The application will require further configuration before it can be deployed to a production environment. For information on configuring the application for deployment, see: https://angular.io/guide/build[Angular Docs - Building and serving Angular apps] or https://angular.io/guide/deployment[Angular Docs - Deployment]. +The application will require further configuration before it can be deployed to a production environment. For information on configuring the application for deployment, see: link:https://angular.dev/tools/cli/build[Angular Docs - Building Angular Apps] or link:https://angular.dev/tools/cli/deployment[Angular Docs - Deployment]. To deploy the application to a local HTTP Server: @@ -190,10 +185,33 @@ The application has now been deployed on the web server. NOTE: Additional configuration is required to deploy the application outside the web server root directory, such as +http://localhost:/my_angular_application+. +[[angular-modules]] +== Angular Modules +`+EditorModule+` is available to import from `+@tinymce/tinymce-angular+`. Which should be included in your `+my.module.ts+` file. + +[source,ts] +---- +import { NgModule } from '@angular/core'; +import { EditorModule, TINYMCE_SCRIPT_SRC } from '@tinymce/tinymce-angular'; + +@NgModule({ + /* ... */ + imports: [ + EditorModule + ], + providers: [ + // If you're self hosting and lazy loading TinyMCE from node_modules: + { provide: TINYMCE_SCRIPT_SRC, useValue: 'tinymce/tinymce.min.js' } + ], + /* ... */ +}) +export class MyModule {} +---- + == Next Steps * For examples of the {productname} integration, see: https://tinymce.github.io/tinymce-angular/[the tinymce-angular storybook]. * For information on customizing: ** {productname} integration, see: xref:angular-ref.adoc[Angular framework Technical Reference]. ** {productname}, see: xref:basic-setup.adoc[Basic setup]. -** The Angular application, see: https://angular.io/docs[the Angular documentation]. +** The Angular application, see: https://angular.dev[the Angular documentation]. diff --git a/modules/ROOT/partials/integrations/svelte-quick-start.adoc b/modules/ROOT/partials/integrations/svelte-quick-start.adoc index 8bb82caf85..057ef53980 100644 --- a/modules/ROOT/partials/integrations/svelte-quick-start.adoc +++ b/modules/ROOT/partials/integrations/svelte-quick-start.adoc @@ -1,4 +1,4 @@ -The https://github.com/tinymce/tinymce-svelte[Official {productname} Svelte component] integrates {productname} into https://svelte.dev/[Svelte applications]. This procedure creates a basic Svelte application using the https://github.com/sveltejs/template[`+sveltejs/template+` project] adds a {productname} editor based using the {productname} Svelte integration. +The https://github.com/tinymce/tinymce-svelte[Official {productname} Svelte component] integrates {productname} into https://svelte.dev/[Svelte applications]. This procedure creates a basic Svelte application containing a {productname} editor. For examples of the {productname} integration, visit https://tinymce.github.io/tinymce-svelte/[the tinymce-svelte storybook]. @@ -8,21 +8,26 @@ This procedure requires https://nodejs.org/[Node.js (and npm)]. == Procedure -. Create a Svelte application using the https://github.com/sveltejs/template[Svelte template project], for example: +. Use the https://github.com/vitejs/vite[Vite] package to create a new Svelte project named `+tinymce-svelte-demo+`, such as: + [source,sh] ---- -npx degit sveltejs/template my-tiny-app -cd my-tiny-app +npm create vite@5 tinymce-svelte-demo -- --template svelte +---- +. Change to the newly created directory. ++ +[source,sh] +---- +cd tinymce-svelte-demo ---- ifeval::["{productSource}" == "package-manager"] . Install the `+tinymce+` and the `+tinymce-svelte+` editor component, such as: + -[source,sh] +[source,sh,subs="attributes+"] ---- -npm install tinymce @tinymce/tinymce-svelte +npm install tinymce@^{productmajorversion} @tinymce/tinymce-svelte ---- endif::[] @@ -38,23 +43,33 @@ npm install @tinymce/tinymce-svelte endif::[] ifeval::["{productSource}" == "cloud"] -. Open `+src/App.svelte+` and add: -* An `+import+` statement for the {productname} component. -* The `++` as a placeholder for the editor. +. Open `+src/App.svelte+` and replace the contents with: + -For example: -+ -_File:_ `+src/App.svelte+` -+ -[source,html] +[source,html,subs="+macros"] ---- -

Hello Tiny

---- @@ -62,50 +77,59 @@ import Editor from '@tinymce/tinymce-svelte'; endif::[] ifeval::["{productSource}" == "package-manager"] -. Install the `+rollup-plugin-copy+` development dependency, such as: +. Install the `+vite-plugin-static-copy+` development dependency, such as: + [source,sh] ---- -npm install rollup-plugin-copy -D +npm install -D vite-plugin-static-copy ---- -. Open `+rollup.config.js+` and configure the rollup copy plugin `+rollup-plugin-copy+` to copy {productname} to the `+public/+` directory, such as: +. Open `+vite.config.js+` and configure the `+vite-plugin-static-copy+` plugin to copy {productname} to the `+public/+` directory, such as: + [source,js] ---- -/* Existing import statements */ -import copy from 'rollup-plugin-copy' +import { defineConfig } from 'vite' +import { svelte } from '@sveltejs/vite-plugin-svelte' +import { viteStaticCopy } from 'vite-plugin-static-copy' -/* Skip to the export statement, `plugins` item and add `copy`*/ -export default { - /* Existing key: values... */ +// https://vitejs.dev/config/ +export default defineConfig({ plugins: [ - copy({ + viteStaticCopy({ targets: [ - { src: 'node_modules/tinymce/*', dest: 'public/tinymce' } + { src: 'node_modules/tinymce/*', dest: 'tinymce' } ] }), - /* More existing configuration... */ - ] -} + svelte() + ], +}) ---- -. Open `+src/App.svelte+` and add: -* An `+import+` statement for the {productname} component. -* The `++` as a placeholder for the editor. -* The xref:svelte-ref.adoc#scriptsrc[`+scriptSrc+`] property for the `+Editor+` placeholder. -+ -For example: -+ -_File:_ `+src/App.svelte+` +. Open `+src/App.svelte+` and replace the contents with: + [source,html] ---- -

Hello Tiny

---- @@ -113,24 +137,33 @@ import Editor from '@tinymce/tinymce-svelte'; endif::[] ifeval::["{productSource}" == "zip"] -. Open `+src/App.svelte+` and add: -* An `+import+` statement for the {productname} component. -* The `++` as a placeholder for the editor. -* The xref:svelte-ref.adoc#scriptsrc[`+scriptSrc+`] property for the `+Editor+` placeholder. -+ -For example: -+ -_File:_ `+src/App.svelte+` +. Open `+src/App.svelte+` and replace the contents with: + [source,html] ---- -

Hello Tiny

---- @@ -145,7 +178,6 @@ endif::[] npm run dev ---- + -This will start a local development server, accessible at http://localhost:8080. * To stop the development server, select on the command line or command prompt and press _Ctrl+C_. == Next Steps diff --git a/modules/ROOT/partials/misc/supported-versions.adoc b/modules/ROOT/partials/misc/supported-versions.adoc index 3d0abacf64..8367b88de5 100644 --- a/modules/ROOT/partials/misc/supported-versions.adoc +++ b/modules/ROOT/partials/misc/supported-versions.adoc @@ -3,22 +3,34 @@ Supported versions of {productname}: -[cols="^,^,^,^",options="header"] +[cols="^,^,^",options="header"] |=== -|Version |Release Date |End of Community Support |End of Premium Support -|7.1 |2024-05-08 |- |2025-11-08 -|7.0 |2024-03-20 |2024-05-08 |2025-09-20 -|6.8 |2023-12-06 |2024-03-20 |2025-06-06 -|6.7 |2023-09-13 |2023-12-06 |2025-03-13 -|6.6 |2023-07-19 |2023-09-13 |2025-01-19 -|6.5 |2023-06-21 |2023-07-19 |2024-12-21 -|6.4 |2023-03-29 |2023-06-21 |2024-09-29 -|6.3 |2022-12-08 |2023-03-29 |2024-06-08 -|6.2 |2022-09-26 |2022-12-08 |2024-03-26 -|6.1 |2022-07-13 |2022-09-26 |2024-01-13 -|6.0 |2022-04-07 |2022-07-13 |2023-10-07 +|Version |Release Date |End of Premium Support +|7.2 |2024-06-19 |2025-12-19 +|7.1 |2024-05-08 |2025-11-08 +|7.0 |2024-03-20 |2025-09-20 +|6.8 |2023-12-06 |2025-06-06 +|6.7 |2023-09-13 |2025-03-13 +|6.6 |2023-07-19 |2025-01-19 +|6.5 |2023-06-21 |2024-12-21 +|6.4 |2023-03-29 |2024-09-29 +|6.3 |2023-12-08 |2024-06-08 +|6.2 |2022-09-26 |2024-03-26 +|6.1 |2022-07-13 |2024-01-13 +|6.0 |2022-04-07 |2023-10-07 |=== +The date listed under "End of Premium Support" indicates the last day you may receive technical assistance for using and integrating the editor. + +Bug fixes and new features are always released in the latest version of {productname} (currently {productname} 7). + +=== Security updates: + +* Security updates are released in the latest minor version of each major version of {productname} that is still under active premium or LTS support ({productname} 7, {productname} 6, {productname} 5 LTS). +* Security updates for the free open source edition of {productname} are issued only for around six months after the new major version is available. Security support for the free open source version of {productname} 6 ends on October 31, 2024. +* For customers with a commercial license, security support for {productname} 6 ends on June 6, 2025. +* {productname} 5 (both open source and commercial versions) is no longer receiving security updates. However, it is possible to extend security support for {productname} 5 by purchasing a dedicated LTS (Long Term Support) agreement. If you are interested in purchasing a {productname} 5 LTS license, please link:https://www.tiny.cloud/contact/[contact us]. + To view our Software License Agreements, visit: * link:{legalpages}/cloud-use-subscription-agreement/[The {cloudname} Services Subscription Agreement]. diff --git a/modules/ROOT/partials/plugin-apis/revisionhistory-apis.adoc b/modules/ROOT/partials/plugin-apis/revisionhistory-apis.adoc index 1ec72c4af9..17dd3a5c2b 100644 --- a/modules/ROOT/partials/plugin-apis/revisionhistory-apis.adoc +++ b/modules/ROOT/partials/plugin-apis/revisionhistory-apis.adoc @@ -10,6 +10,8 @@ interface PluginAPI { Returns a HTML string with annotations indicating the changes in `originalHTML` relative to `changedHTML`. The styling of annotations can be customized via xref:revisionhistory_diff_classes[`+revisionhistory_diff_classes+`] option. +include::partial$misc/admon-requires-7.1v.adoc[] + .Example [source,js] ----