diff --git a/README.md b/README.md index cdf9ae1..0e4912e 100644 --- a/README.md +++ b/README.md @@ -17,4 +17,4 @@ You can download and run these demos locally. Some demos uses premium plugins so ## License The files in this repository are licensed under an MIT license. -TinyMCE is licensed under a LGPL or commercial license. +TinyMCE is available under a commercial license and a subset of the features are open source under the GNU General Public License Version 2 or later. diff --git a/cool-demos/conditional-blocks.html b/cool-demos/conditional-blocks.html index 8c4e23a..9cad55b 100644 --- a/cool-demos/conditional-blocks.html +++ b/cool-demos/conditional-blocks.html @@ -15,52 +15,61 @@ Conditional blocks - + + + diff --git a/cool-demos/wordprocessor.html b/cool-demos/wordprocessor.html index 3ab209b..5e8b46c 100644 --- a/cool-demos/wordprocessor.html +++ b/cool-demos/wordprocessor.html @@ -19,21 +19,21 @@ // This option allows you to specify the buttons and the order that they // will appear on TinyMCE’s toolbar. - // https://www.tiny.cloud/docs/tinymce/6/toolbar-configuration-options/#basic-toolbar-options + // https://www.tiny.cloud/docs/tinymce/latest/toolbar-configuration-options/#basic-toolbar-options toolbar: "undo redo print spellcheckdialog formatpainter | blocks fontfamily fontsize | bold italic underline forecolor backcolor | link image addcomment showcomments | alignleft aligncenter alignright alignjustify lineheight | checklist bullist numlist indent outdent | removeformat", // Tip! The height option accepts any valid CSS for height // If your editor is expected to get larger than the viewport // the sticky toolbar is useful for keeping the controls // always visible - // https://www.tiny.cloud/docs/tinymce/6/editor-size-options/ - // https://www.tiny.cloud/docs/tinymce/6/menus-configuration-options/#toolbar_sticky + // https://www.tiny.cloud/docs/tinymce/latest/editor-size-options/ + // https://www.tiny.cloud/docs/tinymce/latest/menus-configuration-options/#toolbar_sticky height: '700px', toolbar_sticky: true, // You can customize the look and feel of the ui using skins and icons, // In this demo we are using an alternative icon pack - // https://www.tiny.cloud/docs/tinymce/6/editor-icons/ + // https://www.tiny.cloud/docs/tinymce/latest/editor-icons/ icons: 'thin', // The autosave plugin helps prevent data loss if the end-user accidentally @@ -41,13 +41,13 @@ // There are many configuration options to control things like save interval // and retention. The below option loads any unsaved content from local // storage into TinyMCE - // https://www.tiny.cloud/docs/tinymce/6/autosave/#autosave_restore_when_empty + // https://www.tiny.cloud/docs/tinymce/latest/autosave/#autosave_restore_when_empty autosave_restore_when_empty: true, // The Tiny Comments plugin enables you to quickly get collaboration up and // running. There are a lot of customizability but here are the most basic // options to get you started - // https://www.tiny.cloud/docs/tinymce/6/introduction-to-tiny-comments/ + // https://www.tiny.cloud/docs/tinymce/latest/introduction-to-tiny-comments/ tinycomments_mode: 'embedded', tinycomments_author: 'john.doe', tinycomments_author_name: 'John Doe', @@ -57,7 +57,7 @@ // In a real world scenario, with much more custom styles for headings // links, tables, images etc, it's recommended to use the content_css // option to load a separate CSS file. Makes editing easier too. - // https://www.tiny.cloud/docs/tinymce/6/add-css-options/ + // https://www.tiny.cloud/docs/tinymce/latest/add-css-options/ content_style: ` body { background: #fff; diff --git a/email/marketing-email-inline-mode-fixed-toolbar.html b/email/marketing-email-inline-mode-fixed-toolbar.html index 528b020..85c84cf 100644 --- a/email/marketing-email-inline-mode-fixed-toolbar.html +++ b/email/marketing-email-inline-mode-fixed-toolbar.html @@ -19,13 +19,13 @@ Marketing email editor using inline mode and fixed toolbar - + + - -
-
-
- - - - -
- - - - - - - - - - - - -
-
-

Hey {{first.name}}

-

What's your email editing project?

-

Are you:

-

Building an new email client (i.e. the next Gmail) and need rich text editor functionality?

-

Building email marketing software (i.e. the next Mailchimp) and need to add more rich text editor functionality, or enhance the default editor?

-

Then use the only WYSIWYG editor that is trusted by 1,5M devs!

-

Get started with your 14-day free trial

-
-
- - - - - - - - -
-
-

-

Curious about TinyMCE?

-

Play with this demo to see how our email WYSIWYG editor works!

-
- 		-
-

-

Try Premium plugins!

-

Sign up for a 14 day trial and try out all our premium plugins!

-
-
-
-

Update your email preferences or unsubscribe.

-

Tiny Technologies | 2100 Geng Road, Palo Alto, CA 94303 USA

-
-
+ +
+
+
-
diff --git a/email/webmail-rich-text-editor.html b/email/webmail-rich-text-editor.html index 4589abc..7826595 100644 --- a/email/webmail-rich-text-editor.html +++ b/email/webmail-rich-text-editor.html @@ -8,14 +8,14 @@ Rich text webmail editor demo - + + + + + - - - - - -
- -
- - diff --git a/templates-and-layout/locked-down-template-inline-bordered.html b/templates-and-layout/locked-down-template-inline-bordered.html index b22ae24..42f6240 100644 --- a/templates-and-layout/locked-down-template-inline-bordered.html +++ b/templates-and-layout/locked-down-template-inline-bordered.html @@ -11,7 +11,7 @@ Inline bordered demo - + + diff --git a/templates-and-layout/locked-down-template-inline-default.html b/templates-and-layout/locked-down-template-inline-default.html index b033078..6a20ecc 100644 --- a/templates-and-layout/locked-down-template-inline-default.html +++ b/templates-and-layout/locked-down-template-inline-default.html @@ -11,7 +11,7 @@ Default inline mode - + diff --git a/templates-and-layout/locked-down-template-inline-fixed-toolbar.html b/templates-and-layout/locked-down-template-inline-fixed-toolbar.html index d7792d9..20fcc63 100644 --- a/templates-and-layout/locked-down-template-inline-fixed-toolbar.html +++ b/templates-and-layout/locked-down-template-inline-fixed-toolbar.html @@ -11,7 +11,7 @@ Inline mode with fixed toolbar container - + - - - - - -
- -
- - diff --git a/tinymce-basics/badges.html b/tinymce-basics/badges.html index 2ab9d20..356847b 100644 --- a/tinymce-basics/badges.html +++ b/tinymce-basics/badges.html @@ -13,7 +13,7 @@ Badges with custom text and colors - + + + + @@ -55,7 +55,7 @@
diff --git a/tinymce-basics/format-link-as-button.html b/tinymce-basics/format-link-as-button.html index a124afa..5a70d61 100644 --- a/tinymce-basics/format-link-as-button.html +++ b/tinymce-basics/format-link-as-button.html @@ -13,7 +13,7 @@ Format a link into a call to action button - + - - - - - -
- -
- - diff --git a/tinymce-basics/useful_styles_for_content_css.html b/tinymce-basics/useful_styles_for_content_css.html index 9b19213..b54c4c4 100644 --- a/tinymce-basics/useful_styles_for_content_css.html +++ b/tinymce-basics/useful_styles_for_content_css.html @@ -14,7 +14,7 @@ Useful styles to include in your content css - + + diff --git a/tokens/README.md b/tokens/README.md deleted file mode 100644 index eda4ca4..0000000 --- a/tokens/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Tokens - -Tokens – or mail merge variables such as `{{name.first}}` – are often found in document automation and email editors. Here are three ways you can implement them in TinyMCE. - -**Don't miss!** Each HTML file contains detailed comments for each option to help you get started. diff --git a/tokens/span-based-token.html b/tokens/span-based-token.html deleted file mode 100644 index 33690ab..0000000 --- a/tokens/span-based-token.html +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - Span-based token demo - - - - - - - -
- -
- - diff --git a/tokens/text-based-token.html b/tokens/text-based-token.html deleted file mode 100644 index ce76dfe..0000000 --- a/tokens/text-based-token.html +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - Text-based tokens demo - - - - - - - -
- -
- - diff --git a/tokens/web-component-token.html b/tokens/web-component-token.html deleted file mode 100644 index c72f3d0..0000000 --- a/tokens/web-component-token.html +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - Web component based token demo - - - - - - - -
- -
- -