Ticket #4594: 4594_2.patch

_source/plugins/menu/plugin.js

@@ -97 +97 @@
                                 // Get the element representing the current item.
                                 var element = this._.panel.getBlock( this.id ).element.getDocument().getById( this.id + String( index ) );
 
-                                // Show the submenu.
-                                menu.show( element, 2 );
+                                // Show the submenu, reverse the 'corner' when necessary.
+                                menu.show( element, this._.reverse ? 1 : 2 );
+                                // Inheirit the reverse from parent menu.
+                                menu._.reverse = this._.reverse;
                         }
                 },
 
@@ -147 +149 @@
 
                                         panel.onHide = CKEDITOR.tools.bind( function()
                                         {
+                                                delete this._.reverse;
                                                 this.onHide && this.onHide();
                                         },
                                         this );
@@ -227 +230 @@
                                 // Inject the HTML inside the panel.
                                 element.setHtml( output.join( '' ) );
 
+                                // Off-screen menu support. (#4594)
+                                panel.on( 'position', function ( evt )
+                                {
+                                        evt.removeListener();
+
+                                        var left = evt.data.left,
+                                                top = evt.data.top,
+                                                panelElement = panel.element,
+                                                rtl = panel._.dir == 'rtl',
+                                                viewportSize = panelElement.getWindow().getViewPaneSize();
+
+                                        var panelSize =
+                                        {
+                                                'height' : panelElement.$.offsetHeight,
+                                                'width' : panelElement.$.offsetWidth
+                                        };
+
+                                        // Reverse the 'rtl' offsets.
+                                        if ( this._.reverse )
+                                        {
+                                                left += ( panelSize.width * ( rtl ? 1 : -1 ) );
+                                        }
+                                        // If the menu is horizontal off, shift it toward the opposite direction,
+                                        // meanwhile ask subsequent sub-menus to be opened in the reverse way.
+                                        else if ( rtl ? left < 0 : left + panelSize.width > viewportSize.width )
+                                        {
+                                                left += ( panelSize.width * ( rtl ? 1 : -1 ) );
+                                                this._.reverse = true;
+                                        }
+
+                                        // Vertical off screen is simpler.
+                                        if( top + panelSize.height > viewportSize.height )
+                                                top -= panelSize.height;
+                                        
+                                        evt.data = { left : left, top : top };
+
+                                }, this );
+
+
                                 // Show the panel.
                                 if ( this.parent )
                                         this.parent._.panel.showAsChild( panel, this.id, offsetParent, corner, offsetX, offsetY );
                                 else
                                         panel.showBlock( this.id, offsetParent, corner, offsetX, offsetY );
-
+                                
                                 editor.fire( 'menuShow', [ panel ] );
                         },
 

_source/plugins/floatpanel/plugin.js

@@ -195 +195 @@
                                                 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;
 
@@ -220 +216 @@
                                                                 // 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' );
 
+                                                        // The panel size has been known for now,
+                                                        // allow futher manipulating the position,
+                                                        // e.g. off-screen adjustment for context menu.
+                                                        var position = this.fire( 'position', { top : top, left : left } );
+
+                                                        element.setStyles(
+                                                                {
+                                                                        top : ( position ? position.top : top ) + 'px',
+                                                                        left : ( position ? position.left : left ) + 'px',
+                                                                        visibility      : '',
+                                                                        opacity : '1'   // FF3 is ignoring "visibility"
+                                                                } );
+
+                                                        isShowing = false;
+                                                } , this );
+
+                                                panel.isLoaded ? panelLoad() : panel.onLoad = panelLoad;
                                                 // Set the IFrame focus, so the blur event gets fired.
                                                 CKEDITOR.tools.setTimeout( function()
                                                         {
@@ -255 +262 @@
                                         }, 0, this);
                                 this.visible = 1;
 
-                                if ( this.onShow )
-                                        this.onShow.call( this );
-
-                                isShowing = false;
                         },
 
                         hide : function()
@@ -329 +332 @@
                         }
                 }
         });
+        CKEDITOR.event.implementOn( CKEDITOR.ui.floatPanel.prototype, true );
 })();