Ticket #3878: 3878_4.patch

_source/plugins/pastefromword/dialogs/pastefromword.js

@@ -236 +236 @@
                                 [
                                         {
                                                 type : 'html',
-                                                style : 'white-space: normal;',
+                                                style : 'white-space:normal;width:346px;display:block',
                                                 onShow : function()
                                                 {
                                                         /*

_source/skins/kama/skin.js

@@ -223 +223 @@
                                 width = data.width,
                                 height = data.height,
                                 dialog = data.dialog,
+                                contents = dialog.parts.contents,
                                 standardsMode = !CKEDITOR.env.quirks;
 
                         if ( data.skin != 'kama' )
                                 return;
 
-                        dialog.parts.contents.setStyles(
-                                {
-                                        width : width + 'px',
-                                        height : height + 'px'
-                                });
+                        contents.setStyles(
+                                CKEDITOR.env.ie ?
+                                        {
+                                                width : width + 'px',
+                                                height : height + 'px'
+                                        }
+                                :
+                                        {
+                                                // To avoid having scrollbars in the dialogs, we're
+                                                // (for now) using the "min-xxx" properties, for
+                                                // browsers which well support it (#3878).
+                                                'min-width' : width + 'px',
+                                                'min-height' : height + 'px'
+                                        });
 
                         if ( !CKEDITOR.env.ie )
                                 return;
@@ -240 +250 @@
                         // Fix the size of the elements which have flexible lengths.
                         setTimeout( function()
                                 {
-                                        var content = dialog.parts.contents,
-                                                body = content.getParent(),
+                                        var body = contents.getParent(),
                                                 innerDialog = body.getParent();
 
                                         // tc

CHANGES.html

@@ -130 +130 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3742">#3742</a> : Fixed wrong dialog layout for dialogs without tab bar in IE RTL mode .</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3671">#3671</a> : Fixed body fixing should be applied to the real type under fake elements.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3836">#3836</a> : Fixed remove list in enterMode=BR will merge sibling text to one line.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3878">#3878</a> : Whenever possible, 
+                        dialogs will not present scroolbars if the content is too big for its standard 
+                        size.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>