scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-10 00:11:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix table scroll wrapping [SCI-7569]

Browse source
This commit is contained in:
Martin Artnik 2022-12-14 14:32:23 +01:00
parent 96aea292fb
commit 3ea059529d
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/sitewide/tiny_mce.js vendored
View file

@ -234,6 +234,7 @@ var TinyMCE = (function() {
setTimeout(() => { setTimeout(() => {
$(editor.editorContainer).addClass('show'); $(editor.editorContainer).addClass('show');
$('.tinymce-placeholder').remove(); $('.tinymce-placeholder').remove();
updateScrollPosition($(editor.editorContainer).closest('.tinymce-container'));
}, 400); }, 400);
// Init saved status label // Init saved status label
@ -310,7 +311,6 @@ var TinyMCE = (function() {
editorForm.find('.tinymce-status-badge').addClass('hidden'); editorForm.find('.tinymce-status-badge').addClass('hidden');
editorForm.find('.tinymce-view').removeClass('hidden'); editorForm.find('.tinymce-view').removeClass('hidden');
editor.remove(); editor.remove();
updateScrollPosition(editorForm); updateScrollPosition(editorForm);
if (onSaveCallback) { onSaveCallback(); } if (onSaveCallback) { onSaveCallback(); }
}) })

2
app/javascript/vue/protocol/step_elements/text.vue
View file

@ -73,7 +73,7 @@
}, },
mounted() { mounted() {
if (this.isNew) { if (this.isNew) {
this.enableEditMode() this.enableEditMode();
} }
}, },
methods: { methods: {

4
app/javascript/vue/shared/tinymce.vue
View file

@ -145,7 +145,9 @@
return $(`meta[name=\'${name}\']`).attr('content'); return $(`meta[name=\'${name}\']`).attr('content');
}, },
wrapTables() { wrapTables() {
$(this.$el).find('.tinymce-view table').wrapAll('<div style="overflow: auto"></div>'); this.$nextTick(() => {
$(this.$el).find('.tinymce-view table').css('float', 'none').wrapAll('<div style="overflow: auto"></div>');
});
}, },
initCharacterCount() { initCharacterCount() {
if (!this.editorInstance()) return; if (!this.editorInstance()) return;