Skip to content

Commit d8b6bab

Browse files
authored
Merge pull request #3505 from DMPRoadmap/dependabot/npm_and_yarn/tinymce-7.2.0
Bump tinymce from 6.8.5 to 7.2.0
2 parents 6ec8ba0 + fdecea8 commit d8b6bab

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
- 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.
1616
- Refactor `org_admin/conditions/_form.html.erb` [#3502](https://github.com/DMPRoadmap/roadmap/pull/3502)
1717
- Refactor `Question.save_condition` [#3501](https://github.com/DMPRoadmap/roadmap/pull/3501)
18+
- Bump tinymce from 6.8.5 to 7.2.0 [#3505](https://github.com/DMPRoadmap/roadmap/pull/3505)
1819

1920
## v4.2.0
2021

app/javascript/src/utils/tinymce.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { isObject, isString, isUndefined } from './isType';
2525
// // https://www.tinymce.com/docs/advanced/usage-with-module-loaders/
2626
export const defaultOptions = {
2727
selector: '.tinymce',
28+
license_key: 'gpl',
2829
statusbar: true,
2930
menubar: false,
3031
toolbar: 'bold italic | bullist numlist | link | table',

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"regenerator-runtime": "^0.13.5",
6161
"sass": "^1.57.1",
6262
"timeago.js": "^4.0.2",
63-
"tinymce": "^6.4.1",
63+
"tinymce": "^7.2.0",
6464
"webpack": "^5.75.0",
6565
"webpack-cli": "^5.0.1"
6666
},

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4177,10 +4177,10 @@ timeago.js@^4.0.2:
41774177
resolved "https://registry.yarnpkg.com/timeago.js/-/timeago.js-4.0.2.tgz#724e8c8833e3490676c7bb0a75f5daf20e558028"
41784178
integrity sha512-a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w==
41794179

4180-
tinymce@^6.4.1:
4181-
version "6.8.5"
4182-
resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-6.8.5.tgz#aa9a711c4e0b59d506dd281bade857d35a7b3c59"
4183-
integrity sha512-qAL/FxL7cwZHj4BfaF818zeJJizK9jU5IQzTcSLL4Rj5MaJdiVblEj7aDr80VCV1w9h4Lak9hlnALhq/kVtN1g==
4180+
tinymce@^7.2.0:
4181+
version "7.2.0"
4182+
resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-7.2.0.tgz#c5015567e742093b43186400c3e7c8394b90cc1f"
4183+
integrity sha512-R460NlE4REIFuLcZd9mpHK8zRsHdOueLV2m6Wsn0JHfGhDWMcfB1IqUX2QGrSbJga93ygJbJbNMwb2sakFlE/g==
41844184

41854185
tmp@^0.2.1:
41864186
version "0.2.3"

0 commit comments

Comments
 (0)