vanilla ckeditor-3.0.1

[ckeditor.git] / _source / plugins / floatpanel / plugin.js

diff --git a/_source/plugins/floatpanel/plugin.js b/_source/plugins/floatpanel/plugin.js
index fb5e3a4..0a93528 100644 (file)
--- a/_source/plugins/floatpanel/plugin.js
+++ b/_source/plugins/floatpanel/plugin.js
@@ -55,6 +55,10 @@ CKEDITOR.plugins.add( 'floatpanel',
 \r
                        this.element = element;\r
 \r
+                       // Register panels to editor for easy destroying ( #4241 ).\r
+                       editor.panels ? editor.panels.push( element ) : editor.panels = [ element ];\r
+\r
+\r
                        this._ =\r
                        {\r
                                // The panel that will be floating.\r
@@ -115,7 +119,10 @@ CKEDITOR.plugins.add( 'floatpanel',
                                var left        = position.x + ( offsetX || 0 ),\r
                                        top             = position.y + ( offsetY || 0 );\r
 \r
-                               if ( ( rtl && ( corner == 1 || corner == 4 ) ) || ( !rtl && ( corner == 2 || corner == 3 ) ) )\r
+                               // Floating panels are off by (-1px, 0px) in RTL mode. (#3438)\r
+                               if ( rtl && ( corner == 1 || corner == 4 ) )\r
+                                       left += offsetParent.$.offsetWidth;\r
+                               else if ( !rtl && ( corner == 2 || corner == 3 ) )\r
                                        left += offsetParent.$.offsetWidth - 1;\r
 \r
                                if ( corner == 3 || corner == 4 )\r