Skip to content

Commit aa31095

Browse files
yagee-dekkrebs
authored andcommitted
MIR-1344 update JavaScript dependencies
1 parent 847b1b1 commit aa31095

File tree

7 files changed

+804
-813
lines changed

7 files changed

+804
-813
lines changed

mir-layout/yarn.lock

Lines changed: 243 additions & 139 deletions
Large diffs are not rendered by default.

mir-module/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"bootstrap-datepicker": "1.9.0",
2020
"grunt": "^1.5.3",
2121
"grunt-cli": "^1.2.0",
22-
"grunt-contrib-uglify": "https://github.com/gruntjs/grunt-contrib-uglify.git#harmony",
22+
"grunt-contrib-uglify": "^5.2.2",
2323
"grunt-npmcopy": "^0.1.0",
2424
"handlebars": "4.5.3",
2525
"jquery.dotdotdot": "1.7.4",
@@ -28,14 +28,14 @@
2828
"myclabs.jquery.confirm": "2.7.0",
2929
"openlayers": "4.6.4",
3030
"popper.js": "^1.14.7",
31-
"select2": "4.0.6",
31+
"select2": "^4.0.13",
3232
"typeahead.js": "0.11.1",
3333
"video.js": "7.14.3"
3434
},
3535
"dependencies": {
3636
"ckeditor-notification": "^4.11.2",
3737
"ckeditor-wordcount-plugin": "^1.17.12",
38-
"ckeditor4": "^4.18.0",
38+
"ckeditor4": "~4.22.0",
3939
"vue": "3.2.13",
4040
"vue3-openlayers": "^1.0.0"
4141
}

mir-module/src/main/resources/META-INF/resources/js/ckeditor-config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
CKEDITOR.editorConfig = function( config ) {
22

3+
config.versionCheck = false;
4+
35
config.extraPlugins = 'notification,wordcount';
46

57
config.toolbar = JSON.parse(window["MIR.WebConfig.Editor.CKEditor.Toolbar"] || "{}");
@@ -24,4 +26,4 @@ CKEDITOR.editorConfig = function( config ) {
2426
pasteWarningDuration: window["MIR.WebConfig.Editor.CKEditor.Wordcount.PasteWarningDuration"] || 0
2527
};
2628

27-
};
29+
};

0 commit comments

Comments
 (0)