Ticket #1982: 1982_3.patch

editor/_source/classes/fckpanel.js

@@ -161 +161 @@
         {
                 this.Subpanel = panel ;
                 // If the panel has already been increased enough, get out
-                if (( this.IncreasedX >= width) && (this.IncreasedY >= height))
+                if ( ( this.IncreasedX >= width ) && ( this.IncreasedY >= height ) )
                         return false ;
 
-                this.IncreasedX = Math.max(this.IncreasedX, width) ;
-                this.IncreasedY = Math.max(this.IncreasedY, height) ;
+                this.IncreasedX = Math.max( this.IncreasedX, width ) ;
+                this.IncreasedY = Math.max( this.IncreasedY, height ) ;
         }
 
         var x = this.ShowRect.x ;
@@ -175 +175 @@
         
         // Horizontally increase as needed (sum of widths). 
         // Vertically, use only the maximum of this menu or the submenu
-        this._Popup.show( x, this.ShowRect.y, this.ShowRect.w + w, Math.max(this.ShowRect.h, this.IncreasedY) ) ;
+        var finalWidth = this.ShowRect.w + w ;
+        var finalHeight = Math.max( this.ShowRect.h, this.IncreasedY ) ;
+        if ( this.ParentPanel )
+                this.ParentPanel.ResizeForSubpanel( this, finalWidth, finalHeight ) ;
+        this._Popup.show( x, this.ShowRect.y, finalWidth, finalHeight, this.RelativeElement ) ;
 
         return this.IsRTL ;
 }
@@ -226 +230 @@
                         this.ShowRect = {x:x, y:y, w:iMainWidth, h:eMainNode.offsetHeight} ;
                         this.IncreasedX = 0 ;
                         this.IncreasedY = 0 ;
+                        this.RelativeElement = relElement ;
                 }
 
                 // Second call: Show the Popup at the specified location, with the correct size.
@@ -456 +461 @@
         this._Window = null ;
         this.Document = null ;
         this.MainNode = null ;
+        this.RelativeElement = null ;
 }