diff --git a/.api-version b/.api-version
index 8d81486efa..23863d3def 100644
--- a/.api-version
+++ b/.api-version
@@ -1 +1 @@
-6.7.3
\ No newline at end of file
+6.8.1
\ No newline at end of file
diff --git a/antora.yml b/antora.yml
index c0d639c94a..7011a9243e 100644
--- a/antora.yml
+++ b/antora.yml
@@ -63,6 +63,9 @@ asciidoc:
newline: '
'
virt_ellps: '⋮'
ellps: '
'
+ # Prevent Mergetags becoming variables
+ prefix: '{{'
+ suffix: '}}'
# Demo logos
logofordemos: 'https://www.tiny.cloud/docs/images/logos/android-chrome-256x256.png'
logofordemoshtml: '
{{mce-cursor}}
insertion point marker.
+ Click the Without an insertion point marker category to see and select a template that does not use the {{prefix}}mce-cursor{{suffix}}
insertion point marker.
{{mce-cursor}}
insertion point marker.
+ Click the With an insertion point marker category to see and select a template that does use the {{prefix}}mce-cursor{{suffix}}
insertion point marker.
The Name entry prompt template without the {{mce-cursor}}
insertion point marker, places the insertion point at the end of the template text.
The Name entry prompt template without the {{prefix}}mce-cursor{{suffix}}
insertion point marker, places the insertion point at the end of the template text.
By contrast, the Name entry prompt template with the {{mce-cursor}}
insertion point marker places the insertion point at the right spot for someone to enter their name, as requested.
By contrast, the Name entry prompt template with the {{prefix}}mce-cursor{{suffix}}
insertion point marker places the insertion point at the right spot for someone to enter their name, as requested.
Similarly, the Letter outline template without the {{mce-cursor}}
insertion point marker, places the insertion point at the end of the template text.
Similarly, the Letter outline template without the {{prefix}}mce-cursor{{suffix}}
insertion point marker, places the insertion point at the end of the template text.
And, by equivalent contrast, the Letter outline template with the {{mce-cursor}}
insertion point marker places the insertion point at the right spot for someone to start writing a letter.
And, by equivalent contrast, the Letter outline template with the {{prefix}}mce-cursor{{suffix}}
insertion point marker places the insertion point at the right spot for someone to start writing a letter.
The second pre-defined template in this demonstration — the Letter outline template — shows the {{mce-cursor}}
string working in conjunction with the Merge Tags Premium plugin.
The second pre-defined template in this demonstration — the Letter outline template — shows the {{prefix}}mce-cursor{{suffix}}
string working in conjunction with the Merge Tags Premium plugin.
The fixed string that is the Insertion Point Marker uses the same delimiting characters as are used by default by the Merge Tags plugin.
-The Merge Tags plugin knows nothing about the {{mce-cursor}}
being a marker string for the Advanced Templates plugin. And, if this particular string was used in a Merge Tags configuration, the Merge Tags plugin would recognise it and substitute it with whatever contents it was set to substitute, as expected.
+
The Merge Tags plugin knows nothing about the {{prefix}}mce-cursor{{suffix}}
being a marker string for the Advanced Templates plugin. And, if this particular string was used in a Merge Tags configuration, the Merge Tags plugin would recognise it and substitute it with whatever contents it was set to substitute, as expected.
The Advanced Templates plugin removes the Insertion Point Marker before inserting a template containing the string in to a TinyMCE instance, however.
diff --git a/modules/ROOT/examples/live-demos/advtemplate-insertionpoint/index.js b/modules/ROOT/examples/live-demos/advtemplate-insertionpoint/index.js index 37cc14d08c..425c41a3fa 100644 --- a/modules/ROOT/examples/live-demos/advtemplate-insertionpoint/index.js +++ b/modules/ROOT/examples/live-demos/advtemplate-insertionpoint/index.js @@ -12,7 +12,7 @@ tinymce.init({ }, { title: 'Letter outline', - content: '{{Current.Date}}
{{Honorific}} {{Person.Name.Last}},
Regards,
{{staff.digital.signature}}
{{Staff.Name}}
{{Staff.Email}}
' + content: '{{prefix}}Current.Date{{suffix}}
{{prefix}}Honorific{{suffix}} {{prefix}}Person.Name.Last{{suffix}},
Regards,
{{prefix}}staff.digital.signature{{suffix}}
{{prefix}}Staff.Name{{suffix}}
{{prefix}}Staff.Email{{suffix}}
' }, ], }, @@ -21,11 +21,11 @@ tinymce.init({ items: [ { title: 'Name entry prompt', - content: 'Enter your name:{{mce-cursor}}
Include both your given and family names, in your preferred order.
' + content: 'Enter your name:{{prefix}}mce-cursor{{suffix}}
Include both your given and family names, in your preferred order.
' }, { title: 'Letter outline', - content: '{{Current.Date}}
{{Honorific}} {{Person.Name.Last}},
{{mce-cursor}}
Regards,
{{staff.digital.signature}}
{{Staff.Name}}
{{Staff.Email}}
' + content: '{{prefix}}Current.Date{{suffix}}
{{prefix}}Honorific{{suffix}} {{prefix}}Person.Name.Last{{suffix}},
{{prefix}}mce-cursor{{suffix}}
Regards,
{{prefix}}staff.digital.signature{{suffix}}
{{prefix}}Staff.Name{{suffix}}
{{prefix}}Staff.Email{{suffix}}
' }, ], }, diff --git a/modules/ROOT/examples/live-demos/advtemplate-predefined/index.js b/modules/ROOT/examples/live-demos/advtemplate-predefined/index.js index a17ea7a912..8898bd5216 100644 --- a/modules/ROOT/examples/live-demos/advtemplate-predefined/index.js +++ b/modules/ROOT/examples/live-demos/advtemplate-predefined/index.js @@ -4,15 +4,15 @@ const advtemplate_templates = [ items: [ { title: 'Message received', - content: 'Hey {{Customer.FirstName}}!
\nJust a quick note to say we’ve received your message, and will get back to you within 48 hours.
\nFor reference, your ticket number is: {{Ticket.Number}}
\nShould you have any questions in the meantime, just reply to this email and it will be attached to this ticket.
\n\n
Regards,
\n{{Agent.FirstName}}
' + content: 'Hey {{prefix}}Customer.FirstName{{suffix}}!
\nJust a quick note to say we’ve received your message, and will get back to you within 48 hours.
\nFor reference, your ticket number is: {{prefix}}Ticket.Number{{suffix}}
\nShould you have any questions in the meantime, just reply to this email and it will be attached to this ticket.
\n\n
Regards,
\n{{prefix}}Agent.FirstName{{suffix}}
' }, { title: 'Thanks for the feedback', - content: 'Hi {{Customer.FirstName}},
\nWe appreciate you taking the time to provide feedback on {{Product.Name}}.
\nIt sounds like it wasn’t able to fully meet your expectations, for which we apologize. Rest assured our team looks at each piece of feedback and uses it to decide what to focus on next with {{Product.Name}}.
\n\n
All the best, and let us know if there’s anything else we can do to help.
\n-{{Agent.FirstName}}
' + content: 'Hi {{prefix}}Customer.FirstName{{suffix}},
\nWe appreciate you taking the time to provide feedback on {{prefix}}Product.Name{{suffix}}.
\nIt sounds like it wasn’t able to fully meet your expectations, for which we apologize. Rest assured our team looks at each piece of feedback and uses it to decide what to focus on next with {{prefix}}Product.Name{{suffix}}.
\n\n
All the best, and let us know if there’s anything else we can do to help.
\n-{{prefix}}Agent.FirstName{{suffix}}
' }, { title: 'Still working on case', - content: '\n\n
Hi {{Customer.FirstName}},
\nJust a quick note to let you know we’re still working on your case. It’s taking a bit longer than we hoped, but we’re aiming to get you an answer in the next 48 hours.
\nStay tuned,
\n{{Agent.FirstName}}
' + content: 'Hi {{prefix}}Customer.FirstName{{suffix}},
\nJust a quick note to let you know we’re still working on your case. It’s taking a bit longer than we hoped, but we’re aiming to get you an answer in the next 48 hours.
\nStay tuned,
\n{{prefix}}Agent.FirstName{{suffix}}
' } ] }, @@ -21,11 +21,11 @@ const advtemplate_templates = [ items: [ { title: 'Closing ticket', - content: 'Hi {{Customer.FirstName}},
\nWe haven’t heard back from you in over a week, so we have gone ahead and closed your ticket number {{Ticket.Number}}.
\nIf you’re still running into issues, not to worry, just reply to this email and we will re-open your ticket.
\n\n
All the best,
\n{{Agent.FirstName}}
' + content: 'Hi {{prefix}}Customer.FirstName{{suffix}},
\nWe haven’t heard back from you in over a week, so we have gone ahead and closed your ticket number {{prefix}}Ticket.Number{{suffix}}.
\nIf you’re still running into issues, not to worry, just reply to this email and we will re-open your ticket.
\n\n
All the best,
\n{{prefix}}Agent.FirstName{{suffix}}
' }, { title: 'Post-call survey', - content: 'Hey {{Customer.FirstName}}!
\n\n
How did we do?
\nIf you have a few moments, we’d love you to fill out our post-support survey: {{Survey.Link}}
\n\n
Thanks in advance!
{{Company.Name}} Customer Support
Hey {{prefix}}Customer.FirstName{{suffix}}!
\n\n
How did we do?
\nIf you have a few moments, we’d love you to fill out our post-support survey: {{prefix}}Survey.Link{{suffix}}
\n\n
Thanks in advance!
{{prefix}}Company.Name{{suffix}} Customer Support
Hi {{Customer.FirstName}},
\n\n
My name is {{Agent.FirstName}} and I will be glad to assist you today.
\nTo troubleshoot your issue, we first need your model number, which can be found on the underside of your product beneath the safety warning label.
\nIt should look something like the following: XX.XXXXX.X
\nOnce you send it over, I will advise on next steps.
\n\n
Thanks!
\n{{Agent.FirstName}}
' + content: 'Hi {{prefix}}Customer.FirstName{{suffix}},
\n\n
My name is {{prefix}}Agent.FirstName{{suffix}} and I will be glad to assist you today.
\nTo troubleshoot your issue, we first need your model number, which can be found on the underside of your product beneath the safety warning label.
\nIt should look something like the following: XX.XXXXX.X
\nOnce you send it over, I will advise on next steps.
\n\n
Thanks!
\n{{prefix}}Agent.FirstName{{suffix}}
' }, { title: 'Support escalation', - content: '\n\n
Hi {{Customer.FirstName}},
\nWe have escalated your ticket {{Ticket.Number}} to second-level support.
\nYou should hear back from the new agent on your case, {{NewAgent.FirstName}}, shortly.
\n\n
Thanks,
\n{{Company.Name}} Customer Support
' + content: 'Hi {{prefix}}Customer.FirstName{{suffix}},
\nWe have escalated your ticket {{prefix}}Ticket.Number{{suffix}} to second-level support.
\nYou should hear back from the new agent on your case, {{prefix}}NewAgent.FirstName{{suffix}}, shortly.
\n\n
Thanks,
\n{{prefix}}Company.Name{{suffix}} Customer Support
' } ] } diff --git a/modules/ROOT/examples/live-demos/advtemplate/index.js b/modules/ROOT/examples/live-demos/advtemplate/index.js index 45a84cd932..adb642890f 100644 --- a/modules/ROOT/examples/live-demos/advtemplate/index.js +++ b/modules/ROOT/examples/live-demos/advtemplate/index.js @@ -4,15 +4,15 @@ const data = [ items: [ { title: 'Message received', - content: 'Hey {{Customer.FirstName}}!
\nJust a quick note to say we’ve received your message, and will get back to you within 48 hours.
\nFor reference, your ticket number is: {{Ticket.Number}}
\nShould you have any questions in the meantime, just reply to this email and it will be attached to this ticket.
\n\n
Regards,
\n{{Agent.FirstName}}
' + content: 'Hey {{prefix}}Customer.FirstName\}}!
\nJust a quick note to say we’ve received your message, and will get back to you within 48 hours.
\nFor reference, your ticket number is: {{mergetag-open}}Ticket.Number{{suffix}}
\nShould you have any questions in the meantime, just reply to this email and it will be attached to this ticket.
\n\n
Regards,
\n{{prefix}}Agent.FirstName{{suffix}}
' }, { title: 'Thanks for the feedback', - content: 'Hi {{Customer.FirstName}},
\nWe appreciate you taking the time to provide feedback on {{Product.Name}}.
\nIt sounds like it wasn’t able to fully meet your expectations, for which we apologize. Rest assured our team looks at each piece of feedback and uses it to decide what to focus on next with {{Product.Name}}.
\n\n
All the best, and let us know if there’s anything else we can do to help.
\n-{{Agent.FirstName}}
' + content: 'Hi {{prefix}}Customer.FirstName{{suffix}},
\nWe appreciate you taking the time to provide feedback on {{prefix}}Product.Name{{suffix}}.
\nIt sounds like it wasn’t able to fully meet your expectations, for which we apologize. Rest assured our team looks at each piece of feedback and uses it to decide what to focus on next with {{prefix}}Product.Name{{suffix}}.
\n\n
All the best, and let us know if there’s anything else we can do to help.
\n-{{prefix}}Agent.FirstName{{suffix}}
' }, { title: 'Still working on case', - content: '\n\n
Hi {{Customer.FirstName}},
\nJust a quick note to let you know we’re still working on your case. It’s taking a bit longer than we hoped, but we’re aiming to get you an answer in the next 48 hours.
\nStay tuned,
\n{{Agent.FirstName}}
' + content: 'Hi {{prefix}}Customer.FirstName{{suffix}},
\nJust a quick note to let you know we’re still working on your case. It’s taking a bit longer than we hoped, but we’re aiming to get you an answer in the next 48 hours.
\nStay tuned,
\n{{prefix}}Agent.FirstName{{suffix}}
' } ] }, @@ -21,11 +21,11 @@ const data = [ items: [ { title: 'Closing ticket', - content: 'Hi {{Customer.FirstName}},
\nWe haven’t heard back from you in over a week, so we have gone ahead and closed your ticket number {{Ticket.Number}}.
\nIf you’re still running into issues, not to worry, just reply to this email and we will re-open your ticket.
\n\n
All the best,
\n{{Agent.FirstName}}
' + content: 'Hi {{prefix}}Customer.FirstName{{suffix}},
\nWe haven’t heard back from you in over a week, so we have gone ahead and closed your ticket number {{prefix}}Ticket.Number{{suffix}}.
\nIf you’re still running into issues, not to worry, just reply to this email and we will re-open your ticket.
\n\n
All the best,
\n{{prefix}}Agent.FirstName{{suffix}}
' }, { title: 'Post-call survey', - content: 'Hey {{Customer.FirstName}}!
\n\n
How did we do?
\nIf you have a few moments, we’d love you to fill out our post-support survey: {{Survey.Link}}
\n\n
Thanks in advance!
{{Company.Name}} Customer Support
Hey {{prefix}}Customer.FirstName{{suffix}}!
\n\n
How did we do?
\nIf you have a few moments, we’d love you to fill out our post-support survey: {{prefix}}Survey.Link{{suffix}}
\n\n
Thanks in advance!
{{prefix}}Company.Name{{suffix}} Customer Support
Hi {{Customer.FirstName}},
\n\n
My name is {{Agent.FirstName}} and I will be glad to assist you today.
\nTo troubleshoot your issue, we first need your model number, which can be found on the underside of your product beneath the safety warning label.
\nIt should look something like the following: XX.XXXXX.X
\nOnce you send it over, I will advise on next steps.
\n\n
Thanks!
\n{{Agent.FirstName}}
' + content: 'Hi {{prefix}}Customer.FirstName{{suffix}},
\n\n
My name is {{prefix}}Agent.FirstName{{suffix}} and I will be glad to assist you today.
\nTo troubleshoot your issue, we first need your model number, which can be found on the underside of your product beneath the safety warning label.
\nIt should look something like the following: XX.XXXXX.X
\nOnce you send it over, I will advise on next steps.
\n\n
Thanks!
\n{{prefix}}Agent.FirstName{{suffix}}
' }, { title: 'Support escalation', - content: '\n\n
Hi {{Customer.FirstName}},
\nWe have escalated your ticket {{Ticket.Number}} to second-level support.
\nYou should hear back from the new agent on your case, {{NewAgent.FirstName}}, shortly.
\n\n
Thanks,
\n{{Company.Name}} Customer Support
' + content: 'Hi {{prefix}}Customer.FirstName{{suffix}},
\nWe have escalated your ticket {{prefix}}Ticket.Number{{suffix}} to second-level support.
\nYou should hear back from the new agent on your case, {{prefix}}NewAgent.FirstName{{suffix}}, shortly.
\n\n
Thanks,
\n{{prefix}}Company.Name{{suffix}} Customer Support
' } ] } diff --git a/modules/ROOT/pages/6.3-release-notes.adoc b/modules/ROOT/pages/6.3-release-notes.adoc index 036986a0e5..aebb7e516e 100644 --- a/modules/ROOT/pages/6.3-release-notes.adoc +++ b/modules/ROOT/pages/6.3-release-notes.adoc @@ -226,7 +226,7 @@ tinymce.init({ }); ---- -In this example, typing `{{string}}` followed by a word boundary character (such as a space, full-stop, question mark or comma) will result in the _string_ being turned into an active merge tag. +In this example, typing `{\{string\}}` followed by a word boundary character (such as a space, full-stop, question mark or comma) will result in the _string_ being turned into an active merge tag. ==== Merge tags cannot exceed 255 characters in length @@ -691,4 +691,3 @@ This presentation issue does not affect functionality. Selecting a new *Backgrou A workaround is to apply inline formatting after applying the Text and Background color. When the inline formatting is applied after the Text and Background colors are applied, the presentation error does not occur. NOTE: This checkmark presentation issue occurs in conjunction with the similar checkmark presentation issue documented above. When this presentation issue occurs, the checkmark does denote the current background color in either the *Background color* menu or toolbar item. - diff --git a/modules/ROOT/pages/6.7-release-notes.adoc b/modules/ROOT/pages/6.7-release-notes.adoc index 72547e8a3c..274b8c190a 100644 --- a/modules/ROOT/pages/6.7-release-notes.adoc +++ b/modules/ROOT/pages/6.7-release-notes.adoc @@ -85,7 +85,7 @@ This command enables the adding of a new template, specified by its ID, to a {pr See the xref:advanced-templates.adoc#commands[Commands] section of the xref:advanced-templates.adoc[Advanced Templates] documentation for an example of the command in use. -==== New {{mce-cursor}} marker to indicate the cursor position after the template is inserted +==== New {\{mce-cursor\}} marker to indicate the cursor position after the template is inserted // TINY-9973 The new insertion point marker is a fixed string for adding to any template. diff --git a/modules/ROOT/pages/6.7.2-release-notes.adoc b/modules/ROOT/pages/6.7.2-release-notes.adoc index 138fab9ed5..4404e3b1cb 100644 --- a/modules/ROOT/pages/6.7.2-release-notes.adoc +++ b/modules/ROOT/pages/6.7.2-release-notes.adoc @@ -68,7 +68,7 @@ include::partial$misc/admon-no-functionality-changes-in-updated-server-side-comp {productname} 6.7.2 also includes the following bug fixes: -==== The function `getModifierState` did not work on events passed through the editor as expected. +=== The function `getModifierState` did not work on events passed through the editor as expected. // TINY-10263 The exception error "Uncaught TypeError: Illegal invocation" was displayed in the console, when an integrator called the 'getModifierState' function on a **keydown** event object. @@ -76,7 +76,7 @@ As a consequence, any attempts to invoke this function resulted in the TypeError {productname} 6.7.2 addresses this, now, when a integrator uses the `getModifierState` on the event object a keydown event no longer triggers an error. -==== Indenting or outdenting a list item that contained non list item siblings after it would result in those siblings being removed. +=== Indenting or outdenting a list item that contained non list item siblings after it would result in those siblings being removed. // TINY-10268 Previously, when the editor encounter's a list inside an `