From 1118070d3ac2852f11ca933243279609f2191bc5 Mon Sep 17 00:00:00 2001 From: Johannes Raggam Date: Fri, 9 Oct 2020 21:54:06 +0200 Subject: [PATCH] Upgrade TinyMCE to 5.5.1. --- mockup/js/config.js | 14 +++++----- mockup/patterns/tinymce/js/links.js | 22 +++++++++------- .../tinymce/less/pattern.tinymce.less | 3 +-- mockup/patterns/tinymce/pattern.js | 26 ++++++++++--------- news/1024.feature | 2 ++ package.json | 1 + yarn.lock | 5 ++++ 7 files changed, 43 insertions(+), 30 deletions(-) create mode 100644 news/1024.feature diff --git a/mockup/js/config.js b/mockup/js/config.js index c61fc0c97..8dc4f6f3f 100644 --- a/mockup/js/config.js +++ b/mockup/js/config.js @@ -15,14 +15,17 @@ "bbcode", "charmap", "code", + "codesample", "colorpicker", "contextmenu", "directionality", "emoticons", "fullpage", "fullscreen", + "help", "hr", "image", + "imagetools", "importcss", "insertdatetime", "legacyoutput", @@ -35,6 +38,7 @@ "paste", "preview", "print", + "quickbars", "save", "searchreplace", "spellchecker", @@ -43,10 +47,10 @@ "template", "textcolor", "textpattern", + "toc", "visualblocks", "visualchars", "wordcount", - "compat3x", ]; // prettier-ignore @@ -184,8 +188,8 @@ "sinon": "node_modules/sinon/pkg/sinon", "sortable": "node_modules/sortablejs/dist/sortable.umd", "text": "node_modules/requirejs-text/text", - "tinymce": "node_modules/tinymce-builded/js/tinymce/tinymce", - "tinymce-modern-theme": "node_modules/tinymce-builded/js/tinymce/themes/modern/theme", + "tinymce": "node_modules/tinymce/tinymce", + "tinymce-theme": "node_modules/tinymce/themes/silver/theme", "underscore": "node_modules/underscore/underscore", // For the docs viewer @@ -255,9 +259,7 @@ for (var i = 0; i < tinymcePlugins.length; i = i + 1) { var plugin = tinymcePlugins[i]; requirejsOptions.paths["tinymce-" + plugin] = - "node_modules/tinymce-builded/js/tinymce/plugins/" + - plugin + - "/plugin"; + "node_modules/tinymce/plugins/" + plugin + "/plugin"; requirejsOptions.shim["tinymce-" + plugin] = { deps: ["tinymce"], }; diff --git a/mockup/patterns/tinymce/js/links.js b/mockup/patterns/tinymce/js/links.js index a68dbd670..80c5c0648 100644 --- a/mockup/patterns/tinymce/js/links.js +++ b/mockup/patterns/tinymce/js/links.js @@ -348,17 +348,17 @@ define([ }); tinymce.PluginManager.add("ploneimage", function (editor) { - editor.addButton("ploneimage", { + editor.ui.registry.addButton("ploneimage", { icon: "image", tooltip: "Insert/edit image", - onclick: editor.settings.addImageClicked, + onAction: editor.settings.addImageClicked, stateSelector: "img:not([data-mce-object])", }); - editor.addMenuItem("ploneimage", { + editor.ui.registry.addMenuItem("ploneimage", { icon: "image", text: "Insert image", - onclick: editor.settings.addImageClicked, + onAction: editor.settings.addImageClicked, context: "insert", prependToContext: true, }); @@ -366,28 +366,30 @@ define([ /* register the tinymce plugin */ tinymce.PluginManager.add("plonelink", function (editor) { - editor.addButton("plonelink", { + editor.ui.registry.addButton("plonelink", { icon: "link", tooltip: "Insert/edit link", shortcut: "Ctrl+K", - onclick: editor.settings.addLinkClicked, + onAction: editor.settings.addLinkClicked, stateSelector: "a[href]", }); - editor.addButton("unlink", { + editor.ui.registry.addButton("unlink", { icon: "unlink", tooltip: "Remove link", - cmd: "unlink", + onAction: function () { + editor.execCommand("unlink"); + }, stateSelector: "a[href]", }); editor.addShortcut("Ctrl+K", "", editor.settings.addLinkClicked); - editor.addMenuItem("plonelink", { + editor.ui.registry.addMenuItem("plonelink", { icon: "link", text: "Insert link", shortcut: "Ctrl+K", - onclick: editor.settings.addLinkClicked, + onAction: editor.settings.addLinkClicked, stateSelector: "a[href]", context: "insert", prependToContext: true, diff --git a/mockup/patterns/tinymce/less/pattern.tinymce.less b/mockup/patterns/tinymce/less/pattern.tinymce.less index 1738c7205..5322a6ab8 100644 --- a/mockup/patterns/tinymce/less/pattern.tinymce.less +++ b/mockup/patterns/tinymce/less/pattern.tinymce.less @@ -1,5 +1,4 @@ -@import (inline) - "@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/skin.min.css"; +@import (inline) "@{bowerPath}tinymce/skins/ui/oxide/skin.min.css"; @import (inline) "@{bowerPath}tinymce-builded/js/tinymce/plugins/visualblocks/css/visualblocks.css"; @import "@{mockupPath}/modal/pattern.modal.less"; diff --git a/mockup/patterns/tinymce/pattern.js b/mockup/patterns/tinymce/pattern.js index 85618797a..d5abd4c3e 100644 --- a/mockup/patterns/tinymce/pattern.js +++ b/mockup/patterns/tinymce/pattern.js @@ -66,7 +66,7 @@ define([ "mockup-patterns-tinymce-url/js/links", "mockup-i18n", "translate", - "tinymce-modern-theme", + //"tinymce-theme", "tinymce-advlist", "tinymce-anchor", "tinymce-autolink", @@ -106,7 +106,6 @@ define([ "tinymce-visualblocks", "tinymce-visualchars", "tinymce-wordcount", - "tinymce-compat3x", ], function ($, _, Base, tinymce, utils, LinkModal, I18n, _t) { "use strict"; @@ -212,27 +211,30 @@ define([ folderTypes: ["Folder", "Plone Site"], tiny: { content_css: - "/base/node_modules/tinymce-builded/js/tinymce/skins/lightgray/content.min.css", - theme: "modern", + "/base/node_modules/tinymce/skins/content/default/content.min.css", + //theme: "silver", plugins: [ "advlist", + "anchor", "autolink", - "lists", + "autosave", "charmap", - "print", - "preview", - "anchor", - "searchreplace", - "visualblocks", "code", + "contextmenu", "fullscreen", "insertdatetime", + "help", + "lists", "media", - "table", - "contextmenu", "paste", "plonelink", "ploneimage", + "print", + "preview", + "searchreplace", + "table", + "visualblocks", + "wordcount", ], menubar: "edit table format tools view insert", toolbar: diff --git a/news/1024.feature b/news/1024.feature new file mode 100644 index 000000000..08b2e6605 --- /dev/null +++ b/news/1024.feature @@ -0,0 +1,2 @@ +Upgrade TinyMCE to 5.5.1. +[thet, frapell] diff --git a/package.json b/package.json index eec017539..f757258ed 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "requirejs-text": "2.0.15", "select2": "https://github.com/ivaynberg/select2.git#3.5.4", "sortablejs": "^1.12.0", + "tinymce": "^5.5.1", "tinymce-builded": "https://github.com/artursmirnov/tinymce_builded.git#4.7.13" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 405118fa7..7716e02e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4916,6 +4916,11 @@ tiny-lr@^1.1.1: version "4.6.2" resolved "https://github.com/artursmirnov/tinymce_builded.git#d171527d7a630f9509b66019be4a012d874ef587" +tinymce@^5.5.1: + version "5.5.1" + resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.5.1.tgz#4f24ca6e7b698a3c7418a39ef0f3d613f4a703a4" + integrity sha512-z03C8/0TBby68Kp7YUTSCZ0QJINsFCv9U+Cv3TNHg+T1spZ4V6vOIgD0zeTd/xKqkru0P7IOHoeAnOjfpTLq7g== + tippy.js@5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-5.2.0.tgz#5e5a13a196ad2e39c7ee6cac5bfdb0513e797501"