Ticket #4736: 4736_2.patch

_source/plugins/wysiwygarea/plugin.js

@@ -449 +449 @@
                                                 if ( keystrokeHandler )
                                                         keystrokeHandler.attach( domDocument );
 
-                                                // Cancel default action for backspace in IE on control types. (#4047)
                                                 if ( CKEDITOR.env.ie )
                                                 {
-                                                        editor.on( 'key', function( event )
+                                                        // Cancel default action for backspace in IE on control types. (#4047)
+                                                        domDocument.on( 'keydown', function( evt )
                                                         {
-                                                                if( editor.mode != 'wysiwyg' )
-                                                                        return;
-
                                                                 // Backspace.
-                                                                var control = event.data.keyCode == 8
+                                                                var control = evt.data.getKeystroke() == 8
                                                                                           && editor.getSelection().getSelectedElement();
                                                                 if ( control )
                                                                 {
@@ -467 +464 @@
                                                                         // Remove manually.
                                                                         control.remove();
                                                                         editor.fire( 'saveSnapshot' );
-                                                                        event.cancel();
+                                                                        evt.cancel();
                                                                 }
                                                         } );
-                                                }
+
+                                                        // PageUp/PageDown scrolling is broken in document
+                                                        // with standard doctype, manually fix it. (#4736)
+                                                        if( domDocument.$.compatMode == 'CSS1Compat' )
+                                                        {
+                                                                var pageUpDownKeys = { 33 : 1, 34 : 1 };
+                                                                domDocument.on( 'keydown', function( evt )
+                                                                {
+                                                                        if( evt.data.getKeystroke() in pageUpDownKeys )
+                                                                        {
+                                                                                setTimeout( function ()
+                                                                                {
+                                                                                        editor.getSelection().scrollIntoView();
+                                                                                }, 0 );
+                                                                        }
+                                                                } );
+                                                        }
+                                                }
 
                                                 // Adds the document body as a context menu target.
                                                 if ( editor.contextMenu )

_source/plugins/selection/plugin.js

@@ -949 +949 @@
                         }
                         this.selectRanges( ranges );
                         return this;
+                },
+
+                // Moving scroll bar to the current selection's start position.
+                scrollIntoView : function()
+                {
+                        // If we have split the block, adds a temporary span at the
+                        // range position and scroll relatively to it.
+                        var start = this.getStartElement();
+                        start.scrollIntoView();
                 }
         };
 })();