Changeset 3900

Timestamp:

07/15/09 18:56:38 (4 years ago)

Author:

fredck

Message:

#3878 : Whenever possible, dialogs will not present scrollbars if the content is too big for its standard size.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/pastefromword/dialogs/pastefromword.js (modified) (1 diff)
• _source/skins/kama/skin.js (modified) (3 diffs)

CKEditor/trunk/CHANGES.html

@@ -132 +132 @@
                 <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/3949">#3949</a> : Fixed enterKey within pre-formatted text introduce wrong line-break.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3878">#3878</a> : Whenever possible, 
+                        dialogs will not present scrollbars if the content is too big for its standard 
+                        size.</li>
         </ul>
         <h3>

CKEditor/trunk/_source/plugins/pastefromword/dialogs/pastefromword.js

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

CKEditor/trunk/_source/skins/kama/skin.js

@@ -224 +224 @@
                                 height = data.height,
                                 dialog = data.dialog,
+                                contents = dialog.parts.contents,
                                 standardsMode = !CKEDITOR.env.quirks;
 
@@ -229 +230 @@
                                 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 )
@@ -241 +251 @@
                         setTimeout( function()
                                 {
-                                        var content = dialog.parts.contents,
-                                                body = content.getParent(),
+                                        var body = contents.getParent(),
                                                 innerDialog = body.getParent();