Merge branch 'master' into deploy

2018-12-04 18:18:33 +08:00
parent 7c683b6f11 999ea3a443
commit 51385c96b0
1 changed files with 7 additions and 2 deletions
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -157,8 +157,13 @@ export default {
      })
    },
    destroyTinymce() {
-      if (window.tinymce.get(this.tinymceId)) {
-        window.tinymce.get(this.tinymceId).destroy()
+      const tinymce = window.tinymce.get(this.tinymceId)
+      if (this.fullscreen) {
+        tinymce.execCommand('mceFullScreen')
+      }
+
+      if (tinymce) {
+        tinymce.destroy()
      }
    },
    setContent(value) {