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

Merge pull request #4389 from biosistemika/develop

Browse source 
August hotfix, version 1.26.0.3
This commit is contained in:
artoscinote 2022-08-29 10:10:13 +02:00 committed by GitHub
parent f1a0611645 13b085bc9d
commit a01fd78cd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
1.26.0.2
1.26.0.3

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

@ -75,7 +75,6 @@
},
data() {
return {
editorInstance: null,
characterCount: 0,
blurEventHandler: null,
active: false
@ -97,6 +96,9 @@
}
},
computed: {
editorInstance() {
return tinyMCE.editors[0];
},
error() {
if(this.characterLimit && this.characterCount > this.characterLimit) {
return(
@ -131,8 +133,7 @@
this.$emit('update', data)
}
this.$emit('editingDisabled')
}).then((editorInstance) => {
this.editorInstance = editorInstance[0]; // TinyMCE initialization returns an array
}).then(() => {
this.active = true;
this.initCharacterCount();
});