From a8040999ffb9ae97cde5fc0d57d9f99b575f50d5 Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Tue, 7 Jul 2015 18:08:56 +0200
Subject: [PATCH] [FIX] Destroy the editor properly. This prevents errors like
 'this.getWindow(...).$ is undefined' in Firefox after closing a popup
 containing an editor instance. was opened in a popup window.

---
 web_ckeditor4/static/src/js/web_ckeditor4.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/web_ckeditor4/static/src/js/web_ckeditor4.js b/web_ckeditor4/static/src/js/web_ckeditor4.js
index 1969d29e..809ed604 100644
--- a/web_ckeditor4/static/src/js/web_ckeditor4.js
+++ b/web_ckeditor4/static/src/js/web_ckeditor4.js
@@ -199,11 +199,16 @@ openerp.web_ckeditor4 = function(instance)
         {
             if(this.editor)
             {
-                CKEDITOR.remove(this.editor);
                 this.editor.removeAllListeners();
+                this.editor.destroy();
                 this.editor = null;
             }
         },
+        destroy: function()
+        {
+            this.destroy_content();
+            this._super();
+        },
         destroy_content: function()
         {
             this._cleanup_editor();