Merge branch 'master' into deploy

This commit is contained in:
Pan 2018-12-04 18:18:33 +08:00
commit 51385c96b0
1 changed files with 7 additions and 2 deletions

View File

@ -157,8 +157,13 @@ export default {
}) })
}, },
destroyTinymce() { destroyTinymce() {
if (window.tinymce.get(this.tinymceId)) { const tinymce = window.tinymce.get(this.tinymceId)
window.tinymce.get(this.tinymceId).destroy() if (this.fullscreen) {
tinymce.execCommand('mceFullScreen')
}
if (tinymce) {
tinymce.destroy()
} }
}, },
setContent(value) { setContent(value) {