Changeset 4167

Timestamp:

09/01/09 08:58:29 (4 years ago)

Author:

garry.yao

Message:

Fixing #4241: Float panels are left on screen while editor is destroyed.

Location:

CKEditor/trunk/_source

Files:

• plugins/floatpanel/plugin.js (modified) (1 diff)
• themes/default/theme.js (modified) (2 diffs)

CKEditor/trunk/_source/plugins/floatpanel/plugin.js

@@ -55 +55 @@
 
                         this.element = element;
+
+                        // Register panels to editor for easy destroying ( #4241 ).
+                        editor.panels ? editor.panels.push( element ) : editor.panels = [ element ];
+
 
                         this._ =

CKEditor/trunk/_source/themes/default/theme.js

@@ -153 +153 @@
                 destroy : function( editor )
                 {
-                        var container = editor.container;
+                        var container = editor.container,
+                                panels = editor.panels;
 
                         /*
@@ -180 +181 @@
                                 container.remove();
 
+                        for( var i = 0 ; panels && i < panels.length ; i++ )
+                                        panels[ i ].remove();
+
                         if ( editor.elementMode == CKEDITOR.ELEMENT_MODE_REPLACE )
                         {