Skip to content

Commit ec6068a

Browse files
committed
DOC-2566: Add sidebar_show option to various demos, and include quickbars.
1 parent e77667d commit ec6068a

File tree

8 files changed

+25
-9
lines changed

8 files changed

+25
-9
lines changed

modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,11 @@ import ('https://cdn.jsdelivr.net/npm/@faker-js/faker@9/dist/index.min.js').then
304304
items: 'addcomment showcomments deleteallconversations'
305305
}
306306
},
307-
plugins: [ 'tinycomments', 'mentions', 'help', 'code' ],
307+
plugins: [ 'tinycomments', 'mentions', 'help', 'code', 'quickbars', 'link', 'lists', 'image' ],
308+
quickbars_selection_toolbar: 'alignleft aligncenter alignright | addcomment showcomments',
309+
quickbars_image_toolbar: 'alignleft aligncenter alignright | rotateleft rotateright | imageoptions',
308310
tinycomments_mentions_enabled: true,
311+
sidebar_show: 'showcomments',
309312

310313
mentions_item_type: 'profile',
311314
mentions_min_chars: 0,

modules/ROOT/examples/live-demos/comments-callback/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,13 +696,15 @@ tinymce.ScriptLoader.loadScripts(
696696
tinymce.init({
697697
selector: 'textarea#comments-callback',
698698
height: 800,
699-
plugins: 'code tinycomments help lists',
699+
plugins: 'code tinycomments help lists quickbars link image',
700700
toolbar:
701701
'addcomment showcomments | undo redo | blocks | ' +
702702
'bold italic backcolor | alignleft aligncenter ' +
703703
'alignright alignjustify | bullist numlist outdent indent | ' +
704704
'removeformat | help',
705705
menubar: 'file edit view insert format tc',
706+
quickbars_selection_toolbar: 'alignleft aligncenter alignright | addcomment showcomments',
707+
quickbars_image_toolbar: 'alignleft aligncenter alignright | rotateleft rotateright | imageoptions',
706708
menu: {
707709
tc: {
708710
title: 'Comments',

modules/ROOT/examples/live-demos/comments-embedded-with-mentions/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,9 @@ import ('https://cdn.jsdelivr.net/npm/@faker-js/faker@9/dist/index.min.js').then
140140
items: 'addcomment showcomments deleteallconversations'
141141
}
142142
},
143-
plugins: [ 'tinycomments', 'mentions', 'help', 'code' ],
143+
plugins: [ 'tinycomments', 'mentions', 'help', 'code', 'quickbars', 'link', 'lists', 'image' ],
144+
quickbars_selection_toolbar: 'alignleft aligncenter alignright | addcomment showcomments',
145+
quickbars_image_toolbar: 'alignleft aligncenter alignright | rotateleft rotateright | imageoptions',
144146
tinycomments_mentions_enabled: true,
145147

146148
mentions_item_type: 'profile',
@@ -152,6 +154,7 @@ import ('https://cdn.jsdelivr.net/npm/@faker-js/faker@9/dist/index.min.js').then
152154
mentions_select,
153155

154156
tinycomments_mode: 'embedded',
157+
sidebar_show: 'showcomments',
155158
tinycomments_author: currentUser.id,
156159
tinycomments_author_name: currentUser.fullName,
157160
tinycomments_avatar: currentUser.image,

modules/ROOT/examples/live-demos/comments-embedded/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const userAllowedToResolve = 'Admin1';
33

44
tinymce.init({
55
selector: 'textarea#comments-embedded',
6-
plugins: 'code tinycomments',
6+
plugins: 'code tinycomments quickbars link lists image',
77
toolbar: 'addcomment showcomments | bold italic underline',
88
menubar: 'file edit view insert format tools tc',
99
menu: {
@@ -12,7 +12,10 @@ tinymce.init({
1212
items: 'addcomment showcomments deleteallconversations'
1313
}
1414
},
15+
quickbars_selection_toolbar: 'alignleft aligncenter alignright | addcomment showcomments',
16+
quickbars_image_toolbar: 'alignleft aligncenter alignright | rotateleft rotateright | imageoptions',
1517
tinycomments_mode: 'embedded',
18+
sidebar_show: 'showcomments',
1619
tinycomments_author: currentAuthor,
1720
tinycomments_can_resolve: (req, done, fail) => {
1821
const allowed = req.comments.length > 0 &&

modules/ROOT/examples/live-demos/comments-readonly-mode/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ tinymce.init({
33
plugins: [
44
"tinycomments", "advlist", "anchor", "autolink", "charmap", "code", "fullscreen",
55
"help", "image", "insertdatetime", "link", "lists", "media",
6-
"preview", "searchreplace", "table", "visualblocks",
6+
"preview", "searchreplace", "table", "visualblocks", "quickbars",
77
],
88
toolbar: "addcomment showcomments togglereadonly | undo redo | styles | bold italic underline strikethrough | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image",
9+
quickbars_selection_toolbar: 'alignleft aligncenter alignright | addcomment showcomments',
10+
quickbars_image_toolbar: 'alignleft aligncenter alignright | rotateleft rotateright | imageoptions',
911
tinycomments_mode: 'embedded',
1012
readonly: true,
1113
setup: (editor) => {

modules/ROOT/examples/live-demos/comments-ui-mode/index.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ tinymce.init({
33
plugins: [
44
"tinycomments", "advlist", "anchor", "autolink", "charmap", "code", "fullscreen",
55
"help", "image", "insertdatetime", "link", "lists", "media",
6-
"preview", "searchreplace", "table", "visualblocks",
6+
"preview", "searchreplace", "table", "visualblocks", "quickbars", 'quickbars', 'image',
77
],
88
toolbar: "addcomment showcomments | undo redo | styles | bold italic underline strikethrough | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image",
9+
quickbars_selection_toolbar: 'alignleft aligncenter alignright | addcomment showcomments',
10+
quickbars_image_toolbar: 'alignleft aligncenter alignright | rotateleft rotateright | imageoptions',
911
tinycomments_mode: 'embedded',
10-
tinycomments_access: 'comment'
12+
tinycomments_access: 'comment',
13+
sidebar_show: 'showcomments'
1114
});

modules/ROOT/pages/7.5-release-notes.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ The **Comments** plugin now offers the `xref:comments-with-mentions.adoc#tinycom
132132

133133
For information on the **Comments with Mentions** feature, see xref:comments-with-mentions.adoc[Configuring the Comments plugin with the Mentions plugin].
134134

135-
==== The `conversationAuthor` property was missing from 'create` conversation events in the EventLog API.
135+
==== The `conversationAuthor` property was missing from `create` conversation events in the EventLog API.
136136
// #TINY-11352
137137

138138
In previous versions of the tinycomments plugin, the `conversationAuthor` property was missing from 'create' events within the event log, which led to incomplete tracking of user interactions when retrieving data through the `+getEventLog()+` API.

modules/ROOT/partials/misc/supported-versions.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Supported versions of {productname}:
66
[cols="^,^,^",options="header"]
77
|===
88
|Version |Release Date |End of Premium Support
9-
|7.5 |2025-11/06 |2027-05-06
9+
|7.5 |2025-11-06 |2027-05-06
1010
|7.4 |2024-10-09 |2026-04-09
1111
|7.3 |2024-08-07 |2026-02-07
1212
|7.2 |2024-06-19 |2025-12-19

0 commit comments

Comments
 (0)