Ticket #8617: 8617_4.patch

_source/plugins/selection/plugin.js

@@ -162 +162 @@
                 var fillingChar = doc && doc.removeCustomData( 'cke-fillingChar' );
                 if ( fillingChar )
                 {
+                        var sel = doc.getSelection();
+                        // Text selection position might get mangled by
+                        // subsequent dom modification. #8617[1]
+                        var bm = getFixedBookmark(doc, sel);
                         // We can't simply remove the filling node because the user
                         // will actually enlarge it when typing, so we just remove the
                         // invisible char from it.
                         fillingChar.setText( fillingChar.getText().replace( /\u200B/g, '' ) );
-                        fillingChar = 0;
+                        bm && sel.selectBookmarks( [ bm ] );
                 }
         }
 
+        function getFixedBookmark ( doc, sel )
+        {
+                var nativeSel = sel.getNative();
+                if ( nativeSel.type != 'None' )
+                {
+                        var bm = sel.createBookmarks2()[ 0 ];
+
+                        if ( nativeSel.anchorNode && nativeSel.anchorNode.data )
+                        {
+                                var anchorFillingCharIndex = nativeSel.anchorNode.data.indexOf( '\u200B' );
+                                if ( nativeSel.anchorOffset > anchorFillingCharIndex )
+                                        bm.startOffset--;
+                        }
+
+                        if ( nativeSel.focusNode && nativeSel.focusNode.data )
+                        {
+                                var focusFillingCharIndex = nativeSel.focusNode.data.indexOf( '\u200B' );
+                                if ( !nativeSel.isCollapsed && nativeSel.focusOffset > focusFillingCharIndex )
+                                        bm.endOffset--;
+                        }
+                }
+                return bm;
+        }
+
         CKEDITOR.plugins.add( 'selection',
         {
                 init : function( editor )
@@ -186 +214 @@
                                                 // executed, so they'll not get blocked by it.
                                                 switch ( e.data.keyCode )
                                                 {
-                                                        case 13 :       // ENTER
                                                         case CKEDITOR.SHIFT + 13 :      // SHIFT-ENTER
-                                                        case 37 :       // LEFT-ARROW
-                                                        case 39 :       // RIGHT-ARROW
-                                                        case 8 :        // BACKSPACE
+                                                        case 13 :       // ENTER 
+                                                        case 33 :       // PAGEUP 
+                                                        case 34 :       // PAGEDOWN 
+                                                        case 35 :       // HOME 
+                                                        case 36 :       // END 
+                                                        case 37 :       // LEFT-ARROW 
+                                                        case 39 :       // RIGHT-ARROW 
+                                                        case 8 :        // BACKSPACE 
+                                                        case 45 :       // INS 
+                                                        case 46 :       // DEl
                                                                 removeFillingChar( editor.document );
                                                 }
                                         }, null, null, 10 );