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

Fix smart annotation on step text and checklist [SCI-7059]

Browse source
This commit is contained in:
Anton 2022-08-05 11:23:36 +02:00
parent 899ab608f8
commit 7992cd97a1
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/vue/shared/inline_edit.vue
View file

@ -117,6 +117,9 @@
}, },
enableEdit(e) { enableEdit(e) {
if (e && $(e.target).hasClass('atwho-user-popover')) return if (e && $(e.target).hasClass('atwho-user-popover')) return
if (e && $(e.target).hasClass('record-info-link')) return
if (e && $(e.target).parent().hasClass('atwho-inserted')) return
this.editing = true; this.editing = true;
this.focus(); this.focus();
this.$nextTick(() => { this.$nextTick(() => {

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

@ -118,8 +118,13 @@
} }
}, },
methods: { methods: {
initTinymce() { initTinymce(e) {
let textArea = `#${this.objectType}_textarea_${this.objectId}`; let textArea = `#${this.objectType}_textarea_${this.objectId}`;
if (e && $(e.target).hasClass('atwho-user-popover')) return
if (e && $(e.target).hasClass('record-info-link')) return
if (e && $(e.target).parent().hasClass('atwho-inserted')) return
TinyMCE.init(textArea, (data) => { TinyMCE.init(textArea, (data) => {
if (data) { if (data) {
this.$emit('update', data) this.$emit('update', data)