Ticket #8617: 8617_1.patch

_source/plugins/selection/plugin.js

@@ -162 +162 @@
                 var fillingChar = doc && doc.removeCustomData( 'cke-fillingChar' );
                 if ( fillingChar )
                 {
+                        var bm,
+                        sel = doc.getSelection(),
+                        nativeSel = sel.getNative();
+
+                        // Text selection position might get mangled by
+                        // subsequent dom modification. #8617[1]
+                        if ( nativeSel.anchorNode === fillingChar.$ )
+                        {
+                                bm = sel.createBookmarks2()[ 0 ];
+                                // Anticipate the removed char.
+                                bm.startOffset--;
+
+                                if ( !nativeSel.isCollpased
+                                         && nativeSel.focusNode == fillingChar.$ )
+                                                bm.endOffset--;
+                        }
+
                         // 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;
+
+                        // Restore the text selection afterward. #8617(2)
+                        bm && sel.selectBookmarks( [ bm ] );
                 }
         }
 
@@ -1724 +1743 @@
                         {
                                 this.document.getSelection().selectRanges( [ this ] );
                         };
-} )();
+} )();
+ No newline at end of file