Ticket #4594: 4594_5.patch

_source/plugins/floatpanel/plugin.js

@@ -191 +191 @@
                                                 if ( rtl )
                                                         left -= element.$.offsetWidth;
 
-                                                element.setStyles(
-                                                        {
-                                                                left : left + 'px',
-                                                                visibility      : '',
-                                                                opacity : '1'   // FF3 is ignoring "visibility"
-                                                        });
+                                                var panelLoad = CKEDITOR.tools.bind( function ()
+                                                {
+                                                        if ( this.onShow )
+                                                                this.onShow.call( this );
 
-                                                if ( block.autoSize )
-                                                {
-                                                        function setHeight()
-                                                        {
+                                                        if ( block.autoSize )
+                                                        {
                                                                 var target = element.getFirst();
                                                                 var height = block.element.$.scrollHeight;
 
@@ -216 +212 @@
                                                                 // Fix IE < 8 visibility.
                                                                 panel._.currentBlock.element.setStyle( 'display', 'none' ).removeStyle( 'display' );
                                                         }
-
-                                                        if ( panel.isLoaded )
-                                                                setHeight();
                                                         else
-                                                                panel.onLoad = setHeight;
-                                                }
-                                                else
-                                                        element.getFirst().removeStyle( 'height' );
+                                                                element.getFirst().removeStyle( 'height' );
 
-                                                // Set the IFrame focus, so the blur event gets fired.
-                                                CKEDITOR.tools.setTimeout( function()
-                                                        {
-                                                                if ( definition.voiceLabel )
-                                                                {
-                                                                        if ( CKEDITOR.env.gecko )
-                                                                        {
-                                                                                var container = iframe.getParent();
-                                                                                container.setAttribute( 'role', 'region' );
-                                                                                container.setAttribute( 'title', definition.voiceLabel );
-                                                                                iframe.setAttribute( 'role', 'region' );
-                                                                                iframe.setAttribute( 'title', ' ' );
-                                                                        }
-                                                                }
-                                                                
-                                                                iframe.$.contentWindow.focus();
+                                                        var panelElement = panel.element,
+                                                                panelWindow = panelElement.getWindow(),
+                                                                windowScroll = panelWindow.getScrollPosition(),
+                                                                viewportSize = panelWindow.getViewPaneSize(),
+                                                                panelSize =
+                                                                {
+                                                                        'height' : panelElement.$.offsetHeight,
+                                                                        'width' : panelElement.$.offsetWidth
+                                                                };
+
+                                                        // If the menu is horizontal off, shift it toward
+                                                        // the opposite language direction.
+                                                        if ( rtl ? left < 0 : left + panelSize.width > viewportSize.width + windowScroll.x )
+                                                                left += ( panelSize.width * ( rtl ? 1 : -1 ) );
+
+                                                        // Vertical off screen is simpler.
+                                                        if( top + panelSize.height > viewportSize.height + windowScroll.y )
+                                                                top -= panelSize.height;
+
+                                                        element.setStyles(
+                                                                {
+                                                                        top : top + 'px',
+                                                                        left : left + 'px',
+                                                                        visibility      : '',
+                                                                        opacity : '1'   // FF3 is ignoring "visibility"
+                                                                } );
+
+                                                        isShowing = false;
+
+                                                        // Set the panel frame focus, so the blur event gets fired.
+                                                        CKEDITOR.tools.setTimeout( function()
+                                                                {
+                                                                        if ( definition.voiceLabel )
+                                                                        {
+                                                                                if ( CKEDITOR.env.gecko )
+                                                                                {
+                                                                                        var container = iframe.getParent();
+                                                                                        container.setAttribute( 'role', 'region' );
+                                                                                        container.setAttribute( 'title', definition.voiceLabel );
+                                                                                        iframe.setAttribute( 'role', 'region' );
+                                                                                        iframe.setAttribute( 'title', ' ' );
+                                                                                }
+                                                                        }
+
+                                                                        iframe.$.contentWindow.focus();
 
-                                                                // We need this get fired manually because of unfired focus() function.
-                                                                if ( CKEDITOR.env.ie && !CKEDITOR.env.quirks )
-                                                                        this.allowBlur( true );
-                                                        }, 0, this);
+                                                                        // We need this get fired manually because of unfired focus() function.
+                                                                        if ( CKEDITOR.env.ie && !CKEDITOR.env.quirks )
+                                                                                this.allowBlur( true );
+                                                                }, 0, this);
+
+                                                } , this );
+
+                                                panel.isLoaded ? panelLoad() : panel.onLoad = panelLoad;
                                         }, 0, this);
                                 this.visible = 1;
 
-                                if ( this.onShow )
-                                        this.onShow.call( this );
-
-                                isShowing = false;
                         },
 
                         hide : function()