Ticket #3238: 3238.patch

_source/plugins/dialog/plugin.js

@@ -121 +121 @@
                         editor : editor,
                         element : themeBuilt.element,
                         name : dialogName,
-                        contentSize : { width : 0, height : 0 },
                         size : { width : 0, height : 0 },
                         updateSize : false,
                         contents : {},
@@ -144 +143 @@
                 };
 
                 this.parts = themeBuilt.parts;
+                this.contentSize = { width : 0, height : 0 };
 
                 // Call the CKEDITOR.event constructor to initialize this instance.
                 CKEDITOR.event.call( this );
@@ -436 +436 @@
                 {
                         return function( width, height )
                         {
-                                if ( this._.contentSize && this._.contentSize.width == width && this._.contentSize.height == height )
+                                if ( this.contentSize && this.contentSize.width == width && this.contentSize.height == height )
                                         return;
 
                                 CKEDITOR.dialog.fire( 'resize',
@@ -447 +447 @@
                                                 height : height
                                         }, this._.editor );
 
-                                this._.contentSize = { width : width, height : height };
+                                this.contentSize = { width : width, height : height };
                                 this._.updateSize = true;
                         };
                 })(),
@@ -463 +463 @@
                         if ( !this._.updateSize )
                                 return this._.size;
                         var element = this._.element.getFirst();
-                        var size = this._.size = { width : element.$.offsetWidth || 0, height : element.$.offsetHeight || 0};
+                        var size = this._.size = CKEDITOR.dialog.fire( 'getSize',
+                                        {
+                                                dialog : this,
+                                                skin : this._.editor.skinName
+                                        }, this._.editor );
 
-                        // If either the offsetWidth or offsetHeight is 0, the element isn't visible.
-                        this._.updateSize = !size.width || !size.height;
-
+                        this._.updateSize = false;
                         return size;
                 },
 

_source/skins/office2003/skin.js

@@ -69 +69 @@
                                         el.setStyle( 'height', ( body.$.offsetHeight - 31 - 14 ) + 'px' );
                                 },
                                 0 );
+
+                        evt.stop();
                 });
+
+        CKEDITOR.dialog.on( 'getSize', function( evt )
+                {
+                        var dialog = evt.data.dialog, skin = evt.data.skin;
+                        if ( skin != 'office2003' )
+                                return;
+
+                        var dx = 54;
+                        var dy = dialog.getPageCount() < 2 ? 96 : 119;
+
+                        evt.stop();
+                        evt.data = { width : dialog.contentSize.width + dx, height : dialog.contentSize.height + dy };
+                } );
 }

_source/skins/v2/skin.js

@@ -69 +69 @@
                                         el.setStyle( 'height', ( body.$.offsetHeight - 31 - 14 ) + 'px' );
                                 },
                                 0 );
-                });
+
+                        evt.stop();
+                } );
+
+        CKEDITOR.dialog.on( 'getSize', function( evt )
+                {
+                        var dialog = evt.data.dialog, skin = evt.data.skin;
+                        if ( skin != 'v2' )
+                                return;
+
+                        var dx = 54;
+                        var dy = dialog.getPageCount() < 2 ? 96 : 119;
+
+                        evt.stop();
+                        evt.data = { width : dialog.contentSize.width + dx, height : dialog.contentSize.height + dy };
+                } );
 }