Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BC-8259 Use inline version of ckeditor on boards #3583

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dependencies": {
"@braintree/sanitize-url": "^6.0.4",
"@ckeditor/ckeditor5-vue": "^5.1.0",
"@hpi-schul-cloud/ckeditor": "^1.2.0",
"@hpi-schul-cloud/ckeditor": "1.3.0",
"@lumieducation/h5p-webcomponents": "^9.2.2",
"@vuelidate/core": "^2.0.3",
"@vuelidate/validators": "^2.0.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
v-model="modelValue"
:autofocus="autofocus"
:placeholder="$t('components.cardElement.richTextElement.placeholder')"
type="balloon"
type="inline"
mode="simple"
@update:value="onUpdateValue"
@focus="onFocus"
Expand Down
15 changes: 12 additions & 3 deletions src/modules/feature/editor/CKEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,13 @@ export default defineComponent({
const ck = ref(null);
const modelValue = useVModel(props, "value", emit);
const editor = computed(() => {
return props.type === "classic"
? CustomCKEditor.ClassicEditor
: CustomCKEditor.BalloonEditor;
if (props.type === "classic") {
return CustomCKEditor.ClassicEditor;
} else if (props.type === "inline") {
return CustomCKEditor.InlineEditor;
} else {
return CustomCKEditor.BalloonEditor;
}
});

const charCount = ref(0);
Expand Down Expand Up @@ -181,6 +185,11 @@ export default defineComponent({
},
language: locale.value,
placeholder: props.placeholder,
ui: {
viewportOffset: {
top: 220,
},
},
};
});

Expand Down
2 changes: 1 addition & 1 deletion src/styles/css-variables/_layers.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
:root {
--layer-behind: -1;
--layer-page: 1;
--layer-sticky-header: 20;
--layer-sticky-header: 1003;
--layer-dropdown: 30;
--layer-popover: 40;
--layer-tooltip: 50;
Expand Down
Loading