diff --git a/package.json b/package.json index 56487ea84..efe2786e7 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,8 @@ "js-cookie": "^3.0.5", "select2": "git+https://github.com/ivaynberg/select2.git#3.5.4", "sortablejs": "^1.15.6", - "tinymce": "7.9.1", - "tinymce-i18n": "25.7.25", + "tinymce": "8.3.1", + "tinymce-i18n": "25.11.17", "underscore": "^1.13.7" }, "devDependencies": { diff --git a/src/pat/tinymce/tinymce--implementation.js b/src/pat/tinymce/tinymce--implementation.js index 4bd087df5..00255f5ba 100644 --- a/src/pat/tinymce/tinymce--implementation.js +++ b/src/pat/tinymce/tinymce--implementation.js @@ -157,8 +157,11 @@ export default class TinyMCE { tinyOptions.skin = false; // do not show the "upgrade" button for plugins tinyOptions.promotion = false; - // TinyMCE 7 needs "license_key": "gpl" explicitly - tinyOptions.license_key = "gpl"; + + if (!tinyOptions?.license_key) { + // set default license key to "gpl" if not set + tinyOptions.license_key = "gpl"; + } tinyOptions.init_instance_callback = (editor) => { if (this.tiny === undefined || this.tiny === null) { diff --git a/yarn.lock b/yarn.lock index d1923ff01..1543f6688 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8955,15 +8955,15 @@ tinyglobby@0.2.15, tinyglobby@^0.2.14: fdir "^6.5.0" picomatch "^4.0.3" -tinymce-i18n@25.7.25: - version "25.7.25" - resolved "https://registry.yarnpkg.com/tinymce-i18n/-/tinymce-i18n-25.7.25.tgz#ee6c29b9380a361f405f58f9598da61e691f4f21" - integrity sha512-1aa39Z5CE5mEsuLJ1+LQ94l5jo/FM+7r9ndGuwRnMnR3rNcNecF5y/Yeb2NYacAQdAnTzzs61QOC7O7bsPJ9Eg== - -tinymce@7.9.1: - version "7.9.1" - resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-7.9.1.tgz#1b18bad9cb7a3b4b12e3e5a7f29fc7daad0713d7" - integrity sha512-zaOHwmiP1EqTeLRXAvVriDb00JYnfEjWGPdKEuac7MiZJ5aiDMZ4Unc98Gmajn+PBljOmO1GKV6G0KwWn3+k8A== +tinymce-i18n@25.11.17: + version "25.11.17" + resolved "https://registry.yarnpkg.com/tinymce-i18n/-/tinymce-i18n-25.11.17.tgz#4af30adf61e3cff6bed6f847d47aae0bbd10251c" + integrity sha512-Fi5hGRDL9o42VsdahgNgHRHO/4ClAAqIew45QMu8sa5LQT2wTaVPf/tAXnVDHxR7c6NWZQmZp/E18LosxLq42A== + +tinymce@8.3.1: + version "8.3.1" + resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-8.3.1.tgz#04d53f0b18e6ff69afe2bd748b86e495c61d260e" + integrity sha512-mdQdTAA90aEIyhEteIwy+QQ6UnxPCd3qQ5MlGvvByOvnjyOSdBzBcmnXeqWuhGz3fIs3XBJjIw7JyIMiHjebqw== tippy.js@^6.3.7: version "6.3.7"