Skip to content
Permalink
Browse files

Merge branch 't/10367'

  • Loading branch information...
oleq committed May 28, 2013
2 parents 9f79b35 + e5d0ef0 commit a4c8d0f133ea9d5bcb174e84edc3302123425e59
Showing with 4 additions and 1 deletion.
  1. +1 −0 CHANGES.md
  2. +3 −1 core/editable.js
@@ -7,6 +7,7 @@ CKEditor 4 Changelog
* [#9761](http://dev.ckeditor.com/ticket/9761): Update BACKSPACE key state in blockedKeystrokes when using editor.setReadOnly().
* [#10360](http://dev.ckeditor.com/ticket/10360): ARIA role="application" should not be used for dialogs.
* [#10339](http://dev.ckeditor.com/ticket/10339): Error thrown when inserting custom element.
* [#10367](http://dev.ckeditor.com/ticket/10367): Fixed: editable#insertText loses characters if RegExp replace controls are inserted.

## CKEditor 4.1.1

@@ -1619,7 +1619,9 @@
element = element.getParent();
}

return wrapper.getOuterHtml().replace( '{cke-peak}', data );
// Don't use String.replace because it fails in IE7 if special replacement
// characters ($$, $&, etc.) are in data (#10367).
return wrapper.getOuterHtml().split( '{cke-peak}' ).join( data );
}

return insert;

0 comments on commit a4c8d0f

Please sign in to comment.
You can’t perform that action at this time.