FIX Ensure TinyMCE is correctly instantiated and removed when dom mat…

…ching changes Also improves the logic a little so it is easier to read
silverstripe · Nov 28, 2018 · a85b7cd · a85b7cd
1 parent 5d45c7d
commit a85b7cd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/legacy/HtmlEditorField.js b/client/src/legacy/HtmlEditorField.js
@@ -347,7 +347,9 @@ jQuery.entwine('ss', function($) {
     },
 
     onmatch: function() {
-      this.getEditor() || this.onadd();
+      if (!this.getEditor()) {
+        this.onadd();
+      }
       this._super();
     },
 
@@ -359,6 +361,13 @@ jQuery.entwine('ss', function($) {
       this._super();
     },
 
+    onunmatch: function() {
+      if (this.getEditor()) {
+        this.onremove();
+      }
+      this._super();
+    },
+
     /**
      * Make sure the editor has flushed all it's buffers before the form is submitted.
      */