Ticket #6506: 6506.patch

_source/plugins/htmldataprocessor/plugin.js

@@ -98 +98 @@
         for ( i in blockLikeTags )
                 defaultDataBlockFilterRules.elements[ i ] = extendBlockForDisplay;
 
+        var htmlHeightRegex = /((^|;)\s*height\s*\:\s*)[^\;]*(;|$)/i;
+
         var defaultHtmlFilterRules =
                 {
                         elementNames :
@@ -182 +184 @@
                                 {
                                         delete element.attributes.contenteditable;
                                         delete element.attributes[ 'class' ];
+                                        
+                                        if ( element.attributes.style )
+                                        {
+                                                element.attributes.style = element.attributes.style.replace( htmlHeightRegex, function( m, dec, sep, ending )
+                                                        {
+                                                                var realHeight = element.attributes[ '_cke_height' ];
+                                                                if ( !realHeight )
+                                                                        return '';
+                                                                return dec + realHeight + ending;
+                                                        });
+
+                                                if ( element.attributes.style == '' )
+                                                        delete element.attributes.style;
+                                        }
                                 },
 
                                 body : function( element )
@@ -193 +209 @@
                                 style : function( element )
                                 {
                                         var child = element.children[ 0 ];
-                                        child && child.value && ( child.value = CKEDITOR.tools.trim( child.value ));
+                                        child && child.value && ( child.value = CKEDITOR.tools.trim( child.value ) );
 
                                         if ( !element.attributes.type )
                                                 element.attributes.type = 'text/css';

_source/plugins/wysiwygarea/plugin.js

@@ -556 +556 @@
                                                 if ( CKEDITOR.env.gecko )
                                                 {
                                                         // Set the HTML style to 100% to have the text cursor in affect (#6341)
-                                                        domDocument.getDocumentElement().setStyle( 'height', '100%' );
+                                                        var docElement = domDocument.getDocumentElement(), height;
+                                                        if ( ( height = docElement.getStyle( 'height' ) ) )
+                                                                docElement.setAttribute( '_cke_height', height )
+                                                        docElement.setStyle( 'height', '100%' );
+
                                                         domDocument.on( 'mouseup', function( ev )
                                                         {
                                                                 if ( ev.data.$.button == 2 )