Ticket #4174: 4174.patch

_source/core/tools.js

@@ -533 +533 @@
                 repeat : function( str, times )
                 {
                         return new Array( times + 1 ).join( str );
+                },
+
+                capitalize: function( str ) 
+                {
+                  return str.charAt(0).toUpperCase() + str.substring(1).toLowerCase();
                 }
+                
         };
 })();
 

_source/core/dom/element.js

@@ -456 +456 @@
                  * alert( <b>element.getComputedStyle( 'display' )</b> );  // "inline"
                  */
                 getComputedStyle :
-                        CKEDITOR.env.ie ?
-                                function( propertyName )
-                                {
-                                        return this.$.currentStyle[ CKEDITOR.tools.cssStyleToDomStyle( propertyName ) ];
-                                }
+                        CKEDITOR.env.ie ? ( function()
+                        {
+                                var offsetReviseMap =
+                                {
+                                        width: ['Left', 'Right'],
+                                        height: ['Top', 'Bottom'],
+                                        top: ['Top'],
+                                        bottom: ['Bottom']
+                                };
+
+                                return function( propertyName )
+                                {
+                                        var style = this.$.currentStyle[ CKEDITOR.tools.cssStyleToDomStyle( propertyName ) ];
+                                        // IE computed width/height incorrect with auto/percentage values,
+                                        // compute by subtracting padding and border from offset size.
+                                        if( propertyName in offsetReviseMap
+                                                && ( style == 'auto' || style.match( '%' ) ) )
+                                        {
+                                                var style = this.$[ 'offset' + CKEDITOR.tools.capitalize( propertyName ) ],
+                                                        revisement = offsetReviseMap[ propertyName ];
+                                                if( !CKEDITOR.env.quirks )
+                                                {
+                                                        for( var i = 0 ; i < 2 ; i++ )
+                                                        {
+                                                                var side = revisement[ i ];
+                                                                // Justification for content-box-model.
+                                                                if ( side )
+                                                                {
+                                                                        // Todo: Converting the style to pix-based unit.
+                                                                        style -= parseInt( this.getComputedStyle( 'padding' + side ) ) || 0;
+                                                                        style -= parseInt( this.getComputedStyle( 'border' + side ) ) || 0;
+                                                                }
+                                                        }
+
+                                                }
+                                                style += 'px';
+                                        }
+                                        
+                                        return style;
+                                }
+                        } )()
                         :
                                 function( propertyName )
                                 {

_source/plugins/dialog/plugin.js

@@ -489 +489 @@
                 {
                         return function( width, height )
                         {
-                                if ( this._.contentSize && this._.contentSize.width == width && this._.contentSize.height == height )
-                                        return;
 
                                 CKEDITOR.dialog.fire( 'resize',
                                         {
@@ -500 +498 @@
                                                 height : height
                                         }, this._.editor );
 
-                                this._.contentSize = { width : width, height : height };
                                 this._.updateSize = true;
                         };
                 })(),
@@ -516 +513 @@
                         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 =
+                                    { width :  parseInt( element.getComputedStyle( 'width' ) ),
+                                          height : parseInt( element.getComputedStyle( 'height' ) ) };
 
                         // If either the offsetWidth or offsetHeight is 0, the element isn't visible.
                         this._.updateSize = !size.width || !size.height;
@@ -603 +602 @@
                         }
 
 
-                        // First, set the dialog to an appropriate size.
-                        this.resize( definition.minWidth, definition.minHeight );
 
-                        // Select the first tab by default.
-                        this.selectPage( this.definition.contents[0].id );
-
                         // Reset all inputs back to their default value.
                         this.reset();
 
@@ -652 +646 @@
                         // Rearrange the dialog to the middle of the window.
                         CKEDITOR.tools.setTimeout( function()
                                 {
+                                        // Save the initial values of the dialog.
+                                        this.foreach( function( contentObj ) { contentObj.setInitValue && contentObj.setInitValue(); } );
+
+                                        // Select the first tab by default.
+                                        this.selectPage( this.definition.contents[0].id );
+
                                         var viewSize = CKEDITOR.document.getWindow().getViewPaneSize();
                                         var dialogSize = this.getSize();
 
@@ -664 +664 @@
                                         // Execute onLoad for the first show.
                                         this.fireOnce( 'load', {} );
                                         this.fire( 'show', {} );
-
-                                        // Save the initial values of the dialog.
-                                        this.foreach( function( contentObj ) { contentObj.setInitValue && contentObj.setInitValue(); } );
-
                                 },
                                 100, this );
                 },
@@ -876 +872 @@
                         selected[1].show();
                         this._.currentTabId = id;
                         this._.currentTabIndex = CKEDITOR.tools.indexOf( this._.tabIdList, id );
+
+                        this.resize( this.definition.minWidth, this.definition.minHeight );
                 },
 
                 /**

_source/skins/kama/skin.js

@@ -216 +216 @@
                         if ( data.skin != 'kama' )
                                 return;
 
+                        // Make the dialog area size fitable for contents with any size while
+                        // preserve the defined minimum size.(#3878 and #4174)
                         contents.setStyles(
-                                ( CKEDITOR.env.ie || ( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 ) ) ?         // IE && FF2
-                                        {
-                                                width : width + 'px',
-                                                height : height + 'px'
-                                        }
+                                // Only IE6 has no support for min-width/height, but in IE7 we're inside
+                                // a fixed-positioned element where this style is broken too.
+                                ( CKEDITOR.env.ie6Compat || CKEDITOR.env.ie7Compat ) ?
+                                ( function ()
+                                {
+                                        // Reveal the real element size.
+                                        contents.setStyles( { height: 'auto', width : 'auto' } );
+                                        return {
+                                                width : width >= parseInt( contents.getComputedStyle( 'width' ) ) ? width + 'px' : 'auto',
+                                                height : height >= parseInt( contents.getComputedStyle( 'height' ) ) ? height + 'px' : 'auto'
+                                        };
+
+                                } )()
                                 :
                                         {
                                                 // To avoid having scrollbars in the dialogs, we're