Ticket #1659: 1659_5.patch

_source/plugins/wysiwygarea/plugin.js

@@ -115 +115 @@
                 }
         }
 
+        function styleStringsToNumber( styleStrings )
+        {
+                var sum = 0;
+                for ( var i = 0 ; i < styleStrings.length ; i++ )
+                        sum += parseInt( styleStrings[ i ], 10 ) || 0;
+                return sum;
+        }
+
         CKEDITOR.plugins.add( 'wysiwygarea',
         {
                 requires : [ 'editingblock' ],
@@ -247 +255 @@
                                                         body.disabled = true;
                                                         body.contentEditable = true;
                                                         body.removeAttribute( 'disabled' );
+
+                                                        // #1659: Editing area should fill the editable frame in IE (IE7+ part).
+                                                        if ( CKEDITOR.env.version >= 7 && domDocument.compatMode == 'CSS1Compat' )
+                                                        {
+
+                                                                var resizeFunc = CKEDITOR.tools.bind( function()
+                                                                        {
+                                                                                var htmlStyles = this.documentElement.currentStyle;
+                                                                                var bodyStyles = this.body.currentStyle;
+                                                                                var margin  = styleStringsToNumber( [ htmlStyles.marginTop, htmlStyles.marginBottom,
+                                                                                        bodyStyles.marginTop, bodyStyles.marginBottom ] );
+                                                                                var border = styleStringsToNumber( [ htmlStyles.borderTopWidth, htmlStyles.borderBottomWidth,
+                                                                                        bodyStyles.borderTopWidth, bodyStyles.borderBottomWidth ] );
+                                                                                var padding = styleStringsToNumber( [ htmlStyles.paddingTop, htmlStyles.paddingBottom,
+                                                                                        bodyStyles.paddingTop, bodyStyles.paddingBottom ] );
+
+                                                                                // For IE8 only:
+                                                                                // The body tag in IE8 may take the natural top margin of a <p> tag
+                                                                                // into the body margin.
+                                                                                if ( CKEDITOR.env.version >= 8 )
+                                                                                {
+                                                                                        var paragraphs = this.getElementsByTagName( 'p' );
+                                                                                        if ( paragraphs.length > 0 )
+                                                                                        {
+                                                                                                var block = paragraphs[ 0 ];
+                                                                                                margin += block.offsetTop || 0;
+                                                                                        }
+                                                                                }
+
+                                                                                this.body.runtimeStyle.minHeight = ( this.documentElement.clientHeight - margin - border - padding ) + 'px';
+                                                                        }, domDocument );
+
+                                                                domWindow.attachEvent( 'onresize', resizeFunc );
+                                                                resizeFunc();
+                                                        }
                                                 }
                                                 else
                                                         domDocument.designMode = 'on';
@@ -329 +372 @@
                                                                 }
                                                         },
                                                         0 );
+
+                                                // Avoid memory leaks - we're dealing with raw DOM nodes here.
+                                                body = null;
                                         };
 
                                         editor.addMode( 'wysiwyg',

_source/core/dom/element.js

@@ -1354 +1354 @@
                 getChildCount : function()
                 {
                         return this.$.childNodes.length;
-                },
-
+                }
         });

contents.css

@@ -2 +2 @@
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
-
+html
+{
+        /* #1569 fix for IE6 */
+        _padding: 10px;
+}
 body
 {
         /* Font */
@@ -14 +18 @@
 
         /* Remove the background color to make it transparent */
         background-color: #fff;
+
+        /* #1569 fix for IE6 */
+        _margin: 0px;
+        _height: 100%;
 }
 img:-moz-broken
 {