diff options
| author | Marcus Eibrink-Lunzenauer <lunzenauer@elan-ev.de> | 2025-04-11 08:44:34 +0000 |
|---|---|---|
| committer | Marcus Eibrink-Lunzenauer <lunzenauer@elan-ev.de> | 2025-04-11 08:44:34 +0000 |
| commit | d0cc5e95599ee4c9145bcd8e1cab5b742ee5a8b1 (patch) | |
| tree | dd802de05f216effa68768763315889d22b5407d /resources/assets/javascripts | |
| parent | 9eb4a969ac7760c0af0032a80ab9fcc6ddbc1d8b (diff) | |
Fix CKE update to fix #5484
Closes #5484
Merge request studip/studip!4124
Diffstat (limited to 'resources/assets/javascripts')
| -rw-r--r-- | resources/assets/javascripts/chunks/vue.js | 5 | ||||
| -rw-r--r-- | resources/assets/javascripts/chunks/wysiwyg.js | 1 | ||||
| -rw-r--r-- | resources/assets/javascripts/cke/default-config.js | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/resources/assets/javascripts/chunks/vue.js b/resources/assets/javascripts/chunks/vue.js index eafade2..a13147f 100644 --- a/resources/assets/javascripts/chunks/vue.js +++ b/resources/assets/javascripts/chunks/vue.js @@ -12,6 +12,11 @@ import axios from 'axios'; import CKEditor from '@ckeditor/ckeditor5-vue'; +// fixes a problem with @vojtechlanka/vue-tags-input +if (window.Vue) { + window.Vue.use = () => {}; +} + const getHttpClient = () => axios.create({ baseURL: STUDIP.URLHelper.getURL(`jsonapi.php/v1`, {}, true), diff --git a/resources/assets/javascripts/chunks/wysiwyg.js b/resources/assets/javascripts/chunks/wysiwyg.js index fa218b2..88d9c94 100644 --- a/resources/assets/javascripts/chunks/wysiwyg.js +++ b/resources/assets/javascripts/chunks/wysiwyg.js @@ -2,6 +2,7 @@ import BalloonEditor, { createBalloonEditorFromTextarea } from '../cke/balloon-e import ClassicEditor, { createClassicEditorFromTextarea } from '../cke/classic-editor.js'; import { updateVoiceLabel } from '../cke/studip-a11y-dialog/a11y-dialog.js'; +import 'ckeditor5/ckeditor5.css'; import '../../stylesheets/scss/studip-cke-ui.scss'; export { diff --git a/resources/assets/javascripts/cke/default-config.js b/resources/assets/javascripts/cke/default-config.js index 4c71e68..5649549 100644 --- a/resources/assets/javascripts/cke/default-config.js +++ b/resources/assets/javascripts/cke/default-config.js @@ -1,3 +1,5 @@ +import coreTranslations from 'ckeditor5/translations/de.js'; + const customColorPalette = [ { color: '#000000' }, { color: '#6c737a' }, //75% @@ -121,8 +123,8 @@ const defaultConfig = { link: { defaultProtocol: 'https://', }, - // This value must be kept in sync with the language defined in webpack.config.js. language: 'de', + translations: [ coreTranslations ], htmlSupport: { allow: [ /* HTML features to allow */ |