Ticket #4762: 4762_2.patch

_source/plugins/sourcearea/plugin.js

@@ -14 +14 @@
 
         init : function( editor )
         {
-                var sourcearea = CKEDITOR.plugins.sourcearea;
+                var sourcearea = CKEDITOR.plugins.sourcearea,
+                                win = CKEDITOR.document.getWindow();
 
                 editor.on( 'editingBlockReady', function()
                         {
@@ -48 +49 @@
                                                                 'text-align' : 'left'
                                                         };
 
-                                                        // The textarea height/width='100%' doesn't
-                                                        // constraint to the 'td' in IE strick mode
+                                                        // Making the textarea fixed sized to conque the following bugs:
+                                                        // 1. The textarea height/width='100%' doesn't constraint to the 'td' in IE6/7.
+                                                        // 2. Unexpected scroll behavior happens when textarea is overflowed. (#4762)    
                                                         if ( CKEDITOR.env.ie )
                                                         {
-                                                                if ( !CKEDITOR.env.ie8Compat )
-                                                                {
-                                                                        onResize = function()
-                                                                                {
-                                                                                        // Holder rectange size is stretched by textarea,
-                                                                                        // so hide it just for a moment.
-                                                                                        textarea.hide();
-                                                                                        textarea.setStyle( 'height', holderElement.$.clientHeight + 'px' );
-                                                                                        // When we have proper holder size, show textarea again.
-                                                                                        textarea.show();
-                                                                                };
-                                                                        editor.on( 'resize', onResize );
-                                                                        editor.on( 'afterCommandExec', function( event )
-                                                                        {
-                                                                                if ( event.data.name == 'toolbarCollapse' )
-                                                                                        onResize();
-                                                                        });
-                                                                        styles.height = holderElement.$.clientHeight + 'px';
-                                                                }
-                                                        }
+                                                                onResize = function()
+                                                                {
+                                                                        // Holder rectange size is stretched by textarea,
+                                                                        // so hide it just for a moment.
+                                                                        textarea.hide();
+                                                                        textarea.setStyle( 'height', holderElement.$.clientHeight + 'px' );
+                                                                        textarea.setStyle( 'width', holderElement.$.clientWidth + 'px' );
+                                                                        // When we have proper holder size, show textarea again.
+                                                                        textarea.show();
+                                                                };
+
+                                                                editor.on( 'resize', onResize );
+                                                                win.on( 'resize', onResize );
+                                                                setTimeout( onResize, 0 );
+                                                        }
                                                         else
                                                         {
                                                                 // By some yet unknown reason, we must stop the
@@ -139 +136 @@
                                                         editor.textarea = textarea = null;
 
                                                         if ( onResize )
+                                                        {
                                                                 editor.removeListener( 'resize', onResize );
+                                                                win.removeListener( 'resize', onResize );
+                                                        }
 
                                                         if ( CKEDITOR.env.ie && CKEDITOR.env.version < 8 )
                                                                 holderElement.removeStyle( 'position' );

_source/plugins/toolbar/plugin.js

@@ -263 +263 @@
 
                                                                                 var dy = toolboxContainer.$.offsetHeight - previousHeight;
                                                                                 contents.setStyle( 'height', ( contentHeight - dy ) + 'px' );
+
+                                                                                editor.fire( 'resize' );
                                                                         },
 
                                                                         modes : { wysiwyg : 1, source : 1 }