Skip to content

Commit d30f274

Browse files
MitchC1999MitchC1999
committed
Merge remote-tracking branch 'origin/tinymce/7' into hotfix/7/DOC-2608 
2 parents fea6fc5 + e891365 commit d30f274

File tree

90 files changed

+2277
-759
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+2277
-759
lines changed

‎.api-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.6.0
1+
7.7.2

‎antora.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ asciidoc:
2626
# product variables
2727
productname: TinyMCE
2828
productmajorversion: 7
29-
productminorversion: '7.6'
29+
productminorversion: '7.7'
3030
##### product name in codeblock
3131
prodnamecode: tinymce
3232
#### more names

‎modules/ROOT/examples/live-demos/ai/example.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const fetchApi = import(
2-
'https://unpkg.com/@microsoft/[email protected]/lib/esm/index.js'
3-
).then((module) => module.fetchEventSource);
1+
const fetchApi = import('https://cdn.skypack.dev/@microsoft/[email protected]')
2+
.then((module) => module.fetchEventSource);
3+
44

55
// This example stores the API key in the client side integration. This is not recommended for any purpose.
66
// Instead, an alternate method for retrieving the API key should be used.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const fetchApi = import(
2-
'https://unpkg.com/@microsoft/[email protected]/lib/esm/index.js'
3-
).then((module) => module.fetchEventSource);
1+
const fetchApi = import('https://cdn.skypack.dev/@microsoft/[email protected]')
2+
.then((module) => module.fetchEventSource);
3+
44

55
const ai_request = (request, respondWith) => {
66
respondWith.stream((signal, streamMessage) => {

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
tinymce.ScriptLoader.loadScripts(
2+
// Update to use UMD for broader compatibility browser support.
23
[
3-
'//unpkg.com/@pollyjs/[email protected]',
4-
'//unpkg.com/@pollyjs/[email protected]',
5-
'//unpkg.com/@pollyjs/[email protected]',
4+
'https://cdn.jsdelivr.net/npm/@pollyjs/[email protected]/dist/umd/pollyjs-core.js',
5+
'https://cdn.jsdelivr.net/npm/@pollyjs/[email protected]/dist/umd/pollyjs-adapter-fetch.js',
6+
'https://cdn.jsdelivr.net/npm/@pollyjs/[email protected]/dist/umd/pollyjs-persister-local-storage.js',
67
]
78
).then(() => {
89
/******************************

‎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/examples/live-demos/full-featured/example.js‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
const fetchApi = import(
2-
"https://unpkg.com/@microsoft/[email protected]/lib/esm/index.js"
3-
).then((module) => module.fetchEventSource);
1+
const fetchApi = import('https://cdn.skypack.dev/@microsoft/[email protected]')
2+
.then((module) => module.fetchEventSource);
3+
44

55
// This example stores the OpenAI API key in the client side integration. This is not recommended for any purpose.
66
// Instead, an alternate method for retrieving the API key should be used.
77
const openai_api_key = "<INSERT_OPENAI_API_KEY_HERE>";
88

9-
const useDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;
109
const isSmallScreen = window.matchMedia('(max-width: 1023.5px)').matches;
1110

1211
tinymce.init({
@@ -111,8 +110,6 @@ tinymce.init({
111110
content_style: '.mymention{ color: gray; }',
112111
contextmenu: 'link image editimage table configurepermanentpen',
113112
a11y_advanced_options: true,
114-
skin: useDarkMode ? 'oxide-dark' : 'oxide',
115-
content_css: useDarkMode ? 'dark' : 'default',
116113
autocorrect_capitalize: true,
117114
mergetags_list: [
118115
{

‎modules/ROOT/examples/live-demos/full-featured/index.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
const fetchApi = import(
2-
"https://unpkg.com/@microsoft/[email protected]/lib/esm/index.js"
3-
).then((module) => module.fetchEventSource);
1+
const fetchApi = import('https://cdn.skypack.dev/@microsoft/[email protected]')
2+
.then((module) => module.fetchEventSource);
3+
4+
45

56
/* Script to import faker.js for generating random data for demonstration purposes */
67
tinymce.ScriptLoader.loadScripts(['https://cdn.jsdelivr.net/npm/faker@5/dist/faker.min.js']).then(() => {
@@ -141,7 +142,6 @@ tinymce.ScriptLoader.loadScripts(['https://cdn.jsdelivr.net/npm/faker@5/dist/fak
141142
});
142143
};
143144

144-
const useDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;
145145
const isSmallScreen = window.matchMedia('(max-width: 1023.5px)').matches;
146146

147147
const ai_request = (request, respondWith) => {
@@ -523,8 +523,6 @@ tinymce.ScriptLoader.loadScripts(['https://cdn.jsdelivr.net/npm/faker@5/dist/fak
523523
'body { font-family:Helvetica,Arial,sans-serif; font-size:16px }',
524524
contextmenu: 'link image editimage table spellchecker configurepermanentpen',
525525
a11y_advanced_options: true,
526-
skin: useDarkMode ? 'oxide-dark' : 'oxide',
527-
content_css: useDarkMode ? 'dark' : 'default',
528526
mentions_selector: '.mymention',
529527
mentions_fetch: mentions_fetch,
530528
mentions_menu_hover: mentions_menu_hover,

‎modules/ROOT/examples/live-demos/premiumskinsandicons-material-classic/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<script src="https://unpkg.com/material-components-web@latest/dist/material-components-web.min.js"></script>
2-
<link rel="stylesheet" href="https://unpkg.com/material-components-web@latest/dist/material-components-web.min.css">
1+
<script src="https://cdn.jsdelivr.net/npm/material-components-web@latest/dist/material-components-web.min.js"></script>
2+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/material-components-web@latest/dist/material-components-web.min.css">
33
<link href="https://fonts.googleapis.com/css?family=Roboto:400,400i,700,700i" rel="stylesheet">
44

55
<div class="mdc-layout-grid">

‎modules/ROOT/examples/live-demos/premiumskinsandicons-material-outline/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<script src="https://unpkg.com/material-components-web@latest/dist/material-components-web.min.js"></script>
2-
<link rel="stylesheet" href="https://unpkg.com/material-components-web@latest/dist/material-components-web.min.css">
1+
<script src="https://cdn.jsdelivr.net/npm/material-components-web@latest/dist/material-components-web.min.js"></script>
2+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/material-components-web@latest/dist/material-components-web.min.css">
33
<link href="https://fonts.googleapis.com/css?family=Roboto:400,400i,700,700i" rel="stylesheet">
44

55
<div class="mdc-layout-grid">

0 commit comments

Comments
 (0)