scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4315 from aignatov-bio/ai-sci-7059-fix-smart-annotation-for-steps

Browse source 
Fix smart annotation on step text and checklist [SCI-7059]
This commit is contained in:
aignatov-bio 2022-08-05 11:35:36 +02:00 committed by GitHub
parent 899ab608f8 7992cd97a1
commit 578314a8e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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) {
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.focus();
this.$nextTick(() => {

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

@ -118,8 +118,13 @@
}
},
methods: {
initTinymce() {
initTinymce(e) {
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) => {
if (data) {
this.$emit('update', data)