Merge with 374e17d0d96a080d707d8878b047833a9e96ce5e
authorrougeronj
Fri, 12 Jun 2015 15:14:48 +0200
changeset 478 d40fac25b36a
parent 477 b0d234cd739e (current diff)
parent 469 374e17d0d96a (diff)
child 479 be510a7fc5ac
Merge with 374e17d0d96a080d707d8878b047833a9e96ce5e
--- a/client/js/renderer/nodeeditor.js	Fri Jun 12 14:49:25 2015 +0200
+++ b/client/js/renderer/nodeeditor.js	Fri Jun 12 15:14:48 2015 +0200
@@ -63,11 +63,15 @@
                     _this.editor_$.find(".Rk-Edit-Goto").off('click');
 
                     if(_this.options.show_node_editor_description_richtext) {
-                        if(typeof _this.blurListener !== 'undefined') {
-                            _this.editorBlurListener.removeListener();
+                        if(typeof _this.editorListeners !== 'undefined') {
+                            _this.editorListeners.forEach( function(listener) {
+                                listener.removeListener();
+                            });
                         }
                         if(typeof editorInstance.editor !== 'undefined') {
-                            editorInstance.editor.destroy();
+                            var _editor = editorInstance.editor;
+                            delete editorInstance.editor;
+                            _editor.destroy();
                         }
                     }
                     _this.renderer.removeRepresentation(_this);
@@ -138,8 +142,9 @@
                     _this.options.show_node_editor_description_richtext &&
                     typeof editorInstance.editor !== 'undefined')
                 {
-                    editorInstance.editor.on("change", onFieldChange);
-                    _this.editorBlurListener = editorInstance.editor.on("blur", onFieldChange);
+                    _this.editorListeners = [];
+                    _this.editorListeners.push(editorInstance.editor.on("change", onFieldChange));
+                    _this.editorListeners.push(editorInstance.editor.on("blur", onFieldChange));
                 }
 
                 if(_this.options.allow_image_upload) {