vanilla ckeditor-3.4.1

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

diff --git a/_source/plugins/floatpanel/plugin.js b/_source/plugins/floatpanel/plugin.js
index 849d5fc..178459e 100644 (file)
--- a/_source/plugins/floatpanel/plugin.js
+++ b/_source/plugins/floatpanel/plugin.js
@@ -129,14 +129,15 @@ CKEDITOR.plugins.add( 'floatpanel',
 \r
                                element.setStyles(\r
                                        {\r
-                                               top : top + 'px',\r
-                                               left : '-3000px',\r
-                                               opacity : '0',  // FF3 is ignoring "visibility"\r
+                                               top : '-30000px',\r
                                                display : ''\r
                                        });\r
+                               // Don't use display or visibility style because we need to\r
+                               // calculate the rendering layout later and focus the element.\r
+                               element.setOpacity( 0 );\r
 \r
                                // To allow the context menu to decrease back their width\r
-                               element.getFirst().removeStyle('width');\r
+                               element.getFirst().removeStyle( 'width' );\r
 \r
                                // Configure the IFrame blur event. Do that only once.\r
                                if ( !this._.blurSet )\r
@@ -158,10 +159,10 @@ CKEDITOR.plugins.add( 'floatpanel',
                                                        // the blur event may get fired even when focusing\r
                                                        // inside the window itself, so we must ensure the\r
                                                        // target is out of it.\r
-                                                       var target = ev.data.getTarget(),\r
-                                                               targetWindow = target.getWindow && target.getWindow();\r
-\r
-                                                       if ( targetWindow && targetWindow.equals( focused ) )\r
+                                                       var target;\r
+                                                       if ( CKEDITOR.env.ie && !this.allowBlur()\r
+                                                                || ( target = ev.data.getTarget() )\r
+                                                                     && target.getName && target.getName() != 'iframe' )\r
                                                                return;\r
 \r
                                                        if ( this.visible && !this._.activeChild && !isShowing )\r
@@ -182,9 +183,10 @@ CKEDITOR.plugins.add( 'floatpanel',
                                        this._.blurSet = 1;\r
                                }\r
 \r
-                               panel.onEscape = CKEDITOR.tools.bind( function()\r
+                               panel.onEscape = CKEDITOR.tools.bind( function( keystroke )\r
                                        {\r
-                                               this.onEscape && this.onEscape();\r
+                                               if ( this.onEscape && this.onEscape( keystroke ) === false )\r
+                                                       return false;\r
                                        },\r
                                        this );\r
 \r
@@ -202,10 +204,10 @@ CKEDITOR.plugins.add( 'floatpanel',
                                                                // We must adjust first the width or IE6 could include extra lines in the height computation\r
                                                                var widthNode = block.element.$;\r
 \r
-                                                               if ( CKEDITOR.env.gecko || CKEDITOR.env.opera)\r
+                                                               if ( CKEDITOR.env.gecko || CKEDITOR.env.opera )\r
                                                                        widthNode = widthNode.parentNode;\r
 \r
-                                                               if ( CKEDITOR.env.ie)\r
+                                                               if ( CKEDITOR.env.ie )\r
                                                                        widthNode = widthNode.document.body;\r
 \r
                                                                var width = widthNode.scrollWidth;\r
@@ -258,37 +260,45 @@ CKEDITOR.plugins.add( 'floatpanel',
                                                        if ( top + panelSize.height > viewportSize.height + windowScroll.y )\r
                                                                top -= panelSize.height;\r
 \r
+                                                       // If IE is in RTL, we have troubles with absolute\r
+                                                       // position and horizontal scrolls. Here we have a\r
+                                                       // series of hacks to workaround it. (#6146)\r
+                                                       if ( CKEDITOR.env.ie )\r
+                                                       {\r
+                                                               var offsetParent = new CKEDITOR.dom.element( element.$.offsetParent ),\r
+                                                                       scrollParent = offsetParent;\r
+\r
+                                                               // Quirks returns <body>, but standards returns <html>.\r
+                                                               if ( scrollParent.getName() == 'html' )\r
+                                                                       scrollParent = scrollParent.getDocument().getBody();\r
+\r
+                                                               if ( scrollParent.getComputedStyle( 'direction' ) == 'rtl' )\r
+                                                               {\r
+                                                                       // For IE8, there is not much logic on this, but it works.\r
+                                                                       if ( CKEDITOR.env.ie8Compat )\r
+                                                                               left -= element.getDocument().getDocumentElement().$.scrollLeft * 2;\r
+                                                                       else\r
+                                                                               left -= ( offsetParent.$.scrollWidth - offsetParent.$.clientWidth );\r
+                                                               }\r
+                                                       }\r
+\r
                                                        element.setStyles(\r
                                                                {\r
                                                                        top : top + 'px',\r
-                                                                       left : left + 'px',\r
-                                                                       opacity : '1'\r
+                                                                       left : left + 'px'\r
                                                                } );\r
-\r
+                                                       element.setOpacity( 1 );\r
                                                } , this );\r
 \r
                                                panel.isLoaded ? panelLoad() : panel.onLoad = panelLoad;\r
 \r
                                                // Set the panel frame focus, so the blur event gets fired.\r
                                                CKEDITOR.tools.setTimeout( function()\r
-                                                       {\r
-                                                               if ( definition.voiceLabel )\r
-                                                               {\r
-                                                                       if ( CKEDITOR.env.gecko )\r
-                                                                       {\r
-                                                                               var container = iframe.getParent();\r
-                                                                               container.setAttribute( 'role', 'region' );\r
-                                                                               container.setAttribute( 'title', definition.voiceLabel );\r
-                                                                               iframe.setAttribute( 'role', 'region' );\r
-                                                                               iframe.setAttribute( 'title', ' ' );\r
-                                                                       }\r
-                                                               }\r
-\r
-                                                               iframe.$.contentWindow.focus();\r
-                                                               // We need this get fired manually because of unfired focus() function.\r
-                                                               this.allowBlur( true );\r
-\r
-                                                       }, 0, this);\r
+                                               {\r
+                                                       iframe.$.contentWindow.focus();\r
+                                                       // We need this get fired manually because of unfired focus() function.\r
+                                                       this.allowBlur( true );\r
+                                               }, 0, this);\r
                                        }, 0, this);\r
                                this.visible = 1;\r
 \r