diff --git a/CHANGELOG.md b/CHANGELOG.md index 72d803ce26..ee4c80212b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Fixed issues with Conditional Question serialization offered by @briri from PR https://github.com/CDLUC3/dmptool/pull/667 for DMPTool. There is a migration file with code for MySQL and Postgres to update the Conditions table to convert JSON Arrays in string format records in the conditions table so that they are JSON Arrays. - Refactor `org_admin/conditions/_form.html.erb` [#3502](https://github.com/DMPRoadmap/roadmap/pull/3502) - Refactor `Question.save_condition` [#3501](https://github.com/DMPRoadmap/roadmap/pull/3501) +- Bump tinymce from 6.8.5 to 7.2.0 [#3505](https://github.com/DMPRoadmap/roadmap/pull/3505) ## v4.2.0 diff --git a/app/javascript/src/utils/tinymce.js b/app/javascript/src/utils/tinymce.js index de778da215..c1112b1a35 100644 --- a/app/javascript/src/utils/tinymce.js +++ b/app/javascript/src/utils/tinymce.js @@ -25,6 +25,7 @@ import { isObject, isString, isUndefined } from './isType'; // // https://www.tinymce.com/docs/advanced/usage-with-module-loaders/ export const defaultOptions = { selector: '.tinymce', + license_key: 'gpl', statusbar: true, menubar: false, toolbar: 'bold italic | bullist numlist | link | table', diff --git a/package.json b/package.json index daf7b90078..fb0792e659 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "regenerator-runtime": "^0.13.5", "sass": "^1.57.1", "timeago.js": "^4.0.2", - "tinymce": "^6.4.1", + "tinymce": "^7.2.0", "webpack": "^5.75.0", "webpack-cli": "^5.0.1" }, diff --git a/yarn.lock b/yarn.lock index 5ac897171e..e01f051c9e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4177,10 +4177,10 @@ timeago.js@^4.0.2: resolved "https://registry.yarnpkg.com/timeago.js/-/timeago.js-4.0.2.tgz#724e8c8833e3490676c7bb0a75f5daf20e558028" integrity sha512-a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w== -tinymce@^6.4.1: - version "6.8.5" - resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-6.8.5.tgz#aa9a711c4e0b59d506dd281bade857d35a7b3c59" - integrity sha512-qAL/FxL7cwZHj4BfaF818zeJJizK9jU5IQzTcSLL4Rj5MaJdiVblEj7aDr80VCV1w9h4Lak9hlnALhq/kVtN1g== +tinymce@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-7.2.0.tgz#c5015567e742093b43186400c3e7c8394b90cc1f" + integrity sha512-R460NlE4REIFuLcZd9mpHK8zRsHdOueLV2m6Wsn0JHfGhDWMcfB1IqUX2QGrSbJga93ygJbJbNMwb2sakFlE/g== tmp@^0.2.1: version "0.2.3"