Ticket #4521: 4521_4.patch

_source/skins/kama/mainui.css

@@ -6 +6 @@
 .cke_skin_kama
 {
         display: block;
-        _display: inline-block;
 }
 
 /* Main editor only settings. */

_source/skins/office2003/skin.js

@@ -48 +48 @@
                         // Fix the size of the elements which have flexible lengths.
                         var fixSize = function()
                                 {
-                                        var content = dialog.parts.contents,
-                                                body = content.getParent(),
-                                                innerDialog = body.getParent();
+                                        var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ),
+                                                body = innerDialog.getChild( 0 );
 
                                         // tc
                                         var el = innerDialog.getChild( 2 );

_source/skins/office2003/dialog.css

@@ -15 +15 @@
         margin-right: 16px;
         margin-top: 2px;
         margin-bottom: 20px;
-        position: relative;
         z-index: 1;
+
+        /* 'cke_dialog' element has been fixed positioned in all but IE6, while we 
+                need it to be positioned to hold e.g. close button. */
+        position: relative;
+        _position: static;
 }
 
 .cke_skin_office2003 .cke_dialog_tl,

_source/plugins/dialog/plugin.js

@@ -809 +809 @@
                                                         children : contents.elements,
                                                         expand : !!contents.expand,
                                                         padding : contents.padding,
-                                                        style : contents.style || 'width: 100%; height: 100%;'
+                                                        style : contents.style || 'width: 100%;'
                                                 }, pageHtml );
 
                         // Create the HTML for the tab and the content block.

_source/skins/v2/skin.js

@@ -48 +48 @@
                         // Fix the size of the elements which have flexible lengths.
                         setTimeout( function()
                                 {
-                                        var content = dialog.parts.contents,
-                                                body = content.getParent(),
-                                                innerDialog = body.getParent();
+                                        var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ),
+                                                body = innerDialog.getChild( 0 );
 
                                         // tc
                                         var el = innerDialog.getChild( 2 );

_source/skins/kama/skin.js

@@ -218 +218 @@
                                 return;
 
                         contents.setStyles(
-                                ( CKEDITOR.env.ie || ( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 ) ) ?         // IE && FF2
-                                        {
-                                                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'
-                                        });
+                        {
+                                'width' : width + 'px',
+                                'height' : height + 'px'
+                        } );
 
-                        if ( !CKEDITOR.env.ie )
-                                return;
-
                         // Fix the size of the elements which have flexible lengths.
                         setTimeout( function()
                                 {
-                                        var body = contents.getParent(),
-                                                innerDialog = body.getParent();
+                                        var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ),
+                                                body = innerDialog.getChild( 0 );
 
                                         // tc
                                         var el = innerDialog.getChild( 2 );

_source/themes/default/theme.js

@@ -102 +102 @@
                                                 '" dir="', editor.lang.dir, '"' +
                                                 ' lang="', editor.langCode, '"' +
                                                 '>' +
-
-                                                '<div class="cke_dialog', ' ' + CKEDITOR.env.cssClass,
+                                                '<table class="cke_dialog', ' ' + CKEDITOR.env.cssClass,
                                                         ' cke_', editor.lang.dir, '" style="position:absolute">' +
+                                                        '<tr><td>' +
                                                         '<div class="%body">' +
                                                                 '<div id="%title#" class="%title"></div>' +
                                                                 '<div id="%close_button#" class="%close_button">' +
                                                                         '<span>X</span>' +
                                                                 '</div>' +
                                                                 '<div id="%tabs#" class="%tabs"></div>' +
-                                                                '<div id="%contents#" class="%contents"></div>' +
+                                                                  '<table class="%contents"><tr>' +
+                                                                  '<td id="%contents#" class="%contents"></td>' +
+                                                                  '</tr></table>' +
                                                                 '<div id="%footer#" class="%footer"></div>' +
                                                         '</div>' +
                                                         '<div id="%tl#" class="%tl"></div>' +
@@ -122 +124 @@
                                                         '<div id="%bl#" class="%bl"></div>' +
                                                         '<div id="%bc#" class="%bc"></div>' +
                                                         '<div id="%br#" class="%br"></div>' +
-                                                '</div>',
+                                                        '</td></tr>' +
+                                                '</table>',
 
                                                 //Hide the container when loading skins, later restored by skin css.
                                                 ( CKEDITOR.env.ie ? '' : '<style>.cke_dialog{visibility:hidden;}</style>' ),
@@ -132 +135 @@
                                         .replace( /#/g, '_' + baseIdNumber )
                                         .replace( /%/g, 'cke_dialog_' ) );
 
-                        var body = element.getChild( [ 0, 0 ] );
+                        var body = element.getChild( [ 0, 0, 0, 0, 0 ] ),
+                                title = body.getChild( 0 ),
+                                close = body.getChild( 1 );
 
                         // Make the Title and Close Button unselectable.
-                        body.getChild( 0 ).unselectable();
-                        body.getChild( 1 ).unselectable();
+                        title.unselectable();
+                        close.unselectable();
 
 
                         return {
@@ -144 +149 @@
                                 parts :
                                 {
                                         dialog          : element.getChild( 0 ),
-                                        title           : body.getChild( 0 ),
-                                        close           : body.getChild( 1 ),
+                                        title           : title,
+                                        close           : close,
                                         tabs            : body.getChild( 2 ),
-                                        contents        : body.getChild( 3 ),
+                                        contents        : body.getChild( [ 3, 0, 0, 0 ] ),
                                         footer          : body.getChild( 4 )
                                 }
                         };

_source/skins/kama/dialog.css

@@ -18 +18 @@
         -moz-border-radius: 5px;
         -webkit-border-radius: 5px;
         border-radius: 5px;
+
+        /* 'cke_dialog' element has been fixed positioned in all but IE6, while we
+                need it to be positioned to hold e.g. close button. */
+        position: relative;
+        _position: static;
 }
 
 .cke_skin_kama .cke_dialog_tl,

_source/skins/v2/dialog.css

@@ -15 +15 @@
         margin-right: 16px;
         margin-top: 2px;
         margin-bottom: 20px;
-        position: relative;
         z-index: 1;
+
+        /* 'cke_dialog' element has been fixed positioned in all but IE6, while we
+                need it to be positioned to hold e.g. close button. */
+        position: relative;
+        _position: static;
+        
 }
 
 .cke_skin_v2 .cke_dialog_tl,

_source/plugins/image/dialogs/image.js

@@ -442 +442 @@
 
                                                                                                         this.getDialog().dontResetSize = true;
 
-                                                                                                        // In IE7 the dialog is being rendered improperly when loading
-                                                                                                        // an image with a long URL. So we need to delay it a bit. (#4122)
-                                                                                                        setTimeout( function()
-                                                                                                                {
-                                                                                                                        field.setValue( url );          // And call this.onChange()
-                                                                                                                        // Manually set the initial value.(#4191)
-                                                                                                                        field.setInitValue();
-                                                                                                                        field.focus();
-                                                                                                                }, 0 );
+                                                                                                        field.setValue( url );          // And call this.onChange()
+                                                                                                        // Manually set the initial value.(#4191)
+                                                                                                        field.setInitValue();
+                                                                                                        field.focus();
                                                                                                 }
                                                                                         },
                                                                                         commit : function( type, element )