Merge branch 't/10291'

Author: Reinmar

CHANGES.md

@@ -12,6 +12,7 @@ CKEditor 4 Changelog
 * [#10315](http://dev.ckeditor.com/ticket/10315): [Webkit] Undo manager should not record snapshots after filling char has been added/removed.
 * [#10320](http://dev.ckeditor.com/ticket/10320): Justify plugin should add elements to the ACF based on current enter mode.
 * [#10260](http://dev.ckeditor.com/ticket/10260): Fixed: Advanced Content Filter blocks tabSpaces. Unified `data-cke-*` attributes filtering.
+* [#10291](http://dev.ckeditor.com/ticket/10291): [Webkit] Space after filling char should be secured.
 
 ## CKEditor 4.1
 

core/selection.js

@@ -149,7 +149,7 @@
 			// 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.setText( replaceFillingChar( fillingChar.getText() ) );
 
 			// Restore the bookmark.
 			if ( bm ) {
@@ -162,6 +162,13 @@
 		}
 	}
 
+	function replaceFillingChar( html ) {
+		return html.replace( /\u200B( )?/g, function( match ) {
+			// #10291 if filling char is followed by a space replace it with nbsp.
+			return match[ 1 ] ? '\xa0' : '';
+		} );
+	}
+
 	function isReversedSelection( sel ) {
 		if ( !sel.isCollapsed ) {
 			var range = sel.getRangeAt( 0 );
@@ -489,7 +496,7 @@
 						resetSelection = 1;
 
 					fillingCharBefore = fillingChar.getText();
-					fillingChar.setText( fillingCharBefore.replace( /\u200B/g, '' ) );
+					fillingChar.setText( replaceFillingChar( fillingCharBefore ) );
 				}
 			}