Ticket #6387: 6387_3.patch

_source/plugins/autogrow/plugin.js

@@ -39 +39 @@
         {
                 init : function( editor )
                 {
-                        for ( var eventName in { contentDom:1, key:1, selectionChange:1, insertElement:1 } )
+                        for ( var eventName in { contentDom:1, key:1, selectionChange:1, insertElement:1, insertHtml:1 } )
                         {
                                 editor.on( eventName, function( evt )
                                 {
@@ -49 +49 @@
                                                 // Disable autogrow when the editor is maximized .(#6339)
                                                 ( !maximize || maximize.state != CKEDITOR.TRISTATE_ON ) )
                                         {
-                                                setTimeout( function(){ resizeEditor( evt.editor ); }, 100 );
+                                                var html = editor.document.getDocumentElement(),
+                                                        savedOverflow = html.getCustomData( 'savedOverflow' );
+                                                html.setStyle( 'overflow', 'hidden' );
+
+                                                setTimeout( function()
+                                                {
+                                                        if ( !editor.window )
+                                                                return;
+
+                                                        resizeEditor( evt.editor );
+
+                                                        if ( savedOverflow )
+                                                                html.setStyle( 'overflow', savedOverflow );
+                                                        else
+                                                                html.removeStyle( 'overflow' );
+                                                        var sel = editor.getSelection();
+                                                        sel && sel.scrollIntoView();
+                                                }, 100 );
                                         }
                                 });
                         }
+                        editor.on( 'contentDom', function()
+                        {
+                                var html = editor.document.getDocumentElement();
+                                html.setCustomData( 'savedOverflow', html.getStyle( 'overflow' ) );
+                        });
                 }
         });
 })();