fix lint error

ueberdosis · Sep 30, 2020 · 93a29c6 · 93a29c6
1 parent 4d77e8c
commit 93a29c6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+**/dist/**
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -14,9 +14,6 @@ module.exports = {
         './**/*.js',
         './**/*.vue',
       ],
-      excludedFiles: [
-        'dist/**',
-      ],
       plugins: [
         'html',
         'cypress',

diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
@@ -159,7 +159,7 @@ export class Editor extends EventEmitter {
   public setOptions(options: Partial<EditorOptions> = {}) {
     this.options = { ...this.options, ...options }
 
-    if (this.view && this.state) {
+    if (this.view && this.state && !this.isDestroyed) {
       this.view.updateState(this.state)
     }
   }
@@ -399,4 +399,12 @@ export class Editor extends EventEmitter {
     removeElement(this.css)
   }
 
+  /**
+   * Check if the editor is already destroyed.
+   */
+  private get isDestroyed() {
+    // @ts-ignore
+    return !this.view?.docView
+  }
+
 }
diff --git a/packages/vue/src/components/EditorContent.ts b/packages/vue/src/components/EditorContent.ts
@@ -27,6 +27,8 @@ export default Vue.extend({
   },
 
   beforeDestroy() {
-    this.editor.options.element = this.$el
+    this.editor.setOptions({
+      element: this.$el,
+    })
   },
 })