Skip to content

Commit 2e97d32

Browse files
abhinavgandhamabhinavgandham
authored
Merge branch 'feature/7.7.0/DOC-3132' into feature/7.7.0/DOC-3132_TINY-11690
2 parents 52b643d + b430449 commit 2e97d32

File tree

12 files changed

+375
-34
lines changed

12 files changed

+375
-34
lines changed

‎modules/ROOT/examples/live-demos/exportword/index.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ tinymce.init({
1616
left: "1in",
1717
right: "1in"
1818
}
19-
}
19+
},
20+
watermark: {
21+
source: 'http://moxiecode.cachefly.net/tinymce/v9/images/logo.png',
22+
washout: true
23+
},
2024
}
2125
});

‎modules/ROOT/nav.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@
426426
**** xref:7.7.0-release-notes.adoc#improvements[Improvements]
427427
**** xref:7.7.0-release-notes.adoc#additions[Additions]
428428
**** xref:7.7.0-release-notes.adoc#bug-fixes[Bug fixes]
429-
**** xref:7.7.0-release-notes.adoc#security-fixes[Security fixes]
429+
**** xref:7.7.0-release-notes.adoc#known-issues[Known issues]
430430
*** {productname} 7.6.1
431431
**** xref:7.6.1-release-notes.adoc#overview[Overview]
432432
**** xref:7.6.1-release-notes.adoc#accompanying-premium-self-hosted-server-side-component-changes[Accompanying Premium self-hosted server-side component changes]

‎modules/ROOT/pages/7.7.0-release-notes.adoc‎

Lines changed: 243 additions & 31 deletions
Large diffs are not rendered by default.

‎modules/ROOT/pages/changelog.adoc‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,52 @@
44

55
NOTE: This is the {productname} Community version changelog. For information about the latest {cloudname} or {enterpriseversion} Release, see: xref:release-notes.adoc[{productname} Release Notes].
66

7+
== xref:7.7.0-release-notes.adoc[7.7.0 - 2025-02-19]
8+
9+
=== Added
10+
* `link_attributes_postprocess` option that allows overriding attributes of a link that would be inserted through the link dialog.
11+
// #TINY-11707
12+
13+
=== Improved
14+
* Improved visual indication of a keyboard focus for a comment annotation when there is an image inside.
15+
// #TINY-11596
16+
* Not specifying a notification type (or specifying incorrect one) now defaults to 'info'.
17+
// #TINY-11661
18+
* Improved visual separation of comments side panel header.
19+
// #TINY-11715
20+
21+
=== Changed
22+
- Changed the `link` plugin behavior to move the cursor behind a link when inserted or edited via the UI. Patch contributed by Philipp91.
23+
// ##GH-9998
24+
25+
=== Fixed
26+
* Keyboard navigation for size inputs in context forms.
27+
// #TINY-11394
28+
* Keyboard navigation for context form sliders.
29+
// #TINY-11482
30+
* The `insertContent` API was not replacing selected non-editable elements correctly.
31+
// #TINY-11714
32+
* Context toolbar inputs had incorrect margins.
33+
// #TINY-11624
34+
* Iframe aria text used to suggest to open help dialog even when the help plugin was not enabled.
35+
// #TINY-11672
36+
* Preview Dialog incorrectly opened anchor links in a new tab.
37+
// #TINY-11740
38+
* The `float` property was not properly removed on the image when converting a image into a captioned image.
39+
// #TINY-11670
40+
* Expanding selection to a word didn't work inside inline editing host elements.
41+
// #TINY-11304
42+
* The `semantics` element in MathML was not properly retained when `annotation` elements was allowed.
43+
// #TINY-11755
44+
* It was possible to tab to a toolbar group that had all children disabled.
45+
// #TINY-11665
46+
* Keyboard navigation would get stuck on the 'more' toolbar button.
47+
// #TINY-11762
48+
* Toolbar groups had both a `title` attribute and a custom tooltip, causing overlapping tooltips.
49+
// #TINY-11768
50+
* Toolbar text field was properly rendering focus.
51+
// #TINY-11658
52+
753
== xref:7.6.1-release-notes.adoc[7.6.1 - 2025-01-22]
854

955
=== Fixed

‎modules/ROOT/pages/cloud-troubleshooting.adoc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,4 +175,6 @@ This message is shown when {productname} is loaded from a domain that has not be
175175

176176
==== Solution
177177

178-
Please request that your admin add this domain to the approved domains in the Customer Portal. For more information see xref:cloud-troubleshooting.adoc#domain-not-registered[Domain not registered]
178+
Please request that your admin add this domain to the approved domains in the Customer Portal. For more information see xref:cloud-troubleshooting.adoc#domain-not-registered[Domain not registered]
179+
180+
NOTE: From xref:7.6.0-release-notes.adoc[{productname} 7.6.0] onwards, the editor uses disabled mode instead of read-only mode.

‎modules/ROOT/pages/exportword.adoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ include::partial$configuration/exportword_converter_options.adoc[leveloffset=+1]
7777

7878
include::partial$configuration/exportword_converter_style.adoc[leveloffset=+1]
7979

80+
include::partial$configuration/exportword_watermark.adoc[leveloffset=+1]
81+
8082
== Commands
8183

8284
The {pluginname} plugin provides the following {productname} commands.

‎modules/ROOT/pages/link.adoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ include::partial$configuration/link_rel_list.adoc[leveloffset=+1]
4646

4747
include::partial$configuration/link_target_list.adoc[leveloffset=+1]
4848

49+
include::partial$configuration/link_attributes_postprocess.adoc[leveloffset=+1]
50+
4951
include::partial$misc/plugin-toolbar-button-id-boilerplate.adoc[]
5052

5153
include::partial$misc/plugin-menu-item-id-boilerplate.adoc[]

‎modules/ROOT/pages/revisionhistory.adoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ include::partial$configuration/revisionhistory_fetch.adoc[leveloffset=+1]
109109

110110
include::partial$configuration/revisionhistory_fetch_revision.adoc[leveloffset=+1]
111111

112+
include::partial$configuration/revisionhistory_allow_restore.adoc[leveloffset=+1]
113+
112114
include::partial$configuration/revisionhistory_author.adoc[leveloffset=+1]
113115

114116
include::partial$configuration/revisionhistory_display_author.adoc[leveloffset=+1]

‎modules/ROOT/partials/configuration/exportword_watermark.adoc‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
[[watermark]]
2+
== `watermark`
3+
4+
The `watermark` option provides integrators with a way to include semi-transparent image watermarks on each page of the exported document, which can be useful for branding, copyright protection, or decorative purposes.
5+
6+
*Type:* `+Object+`
7+
8+
=== Example : using `watermark`
9+
10+
[source,js]
11+
----
12+
tinymce.init({
13+
selector: "textarea",
14+
plugins: ['exportword'],
15+
toolbar: 'exportword',
16+
exportword_converter_options: {
17+
watermark: {
18+
source: 'http://moxiecode.cachefly.net/tinymce/v9/images/logo.png',
19+
washout: true,
20+
}
21+
}
22+
});
23+
----

‎modules/ROOT/partials/configuration/link_attributes_postprocess.adoc‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
[[link_attributes_postprocess]]
2+
== `+link_attributes_postprocess+`
3+
4+
This option allows overriding attributes of an inserted link.
5+
6+
*Type:* `+Function+`
7+
8+
*Default value:* `+undefined+`
9+
10+
=== Example: using `+link_attributes_postprocess+`
11+
12+
[source,js]
13+
----
14+
tinymce.init({
15+
selector: 'textarea', // change this value according to your HTML
16+
plugins: 'link',
17+
toolbar: 'link',
18+
link_attributes_postprocess: (attrs) => {
19+
console.log(attrs);
20+
if (attrs.rel) {
21+
attrs.rel += 'noreferrer';
22+
}
23+
}
24+
});
25+
26+
----

0 commit comments

Comments
 (0)