Skip to content
Permalink
Browse files

Merge branch 't/10146'

  • Loading branch information...
oleq committed May 28, 2013
2 parents a4c8d0f + 632f03e commit 89d740763dec1e6bc10d7c13a93dc2cadb40bc8d
Showing with 4 additions and 1 deletion.
  1. +1 −0 CHANGES.md
  2. +3 −1 plugins/wysiwygarea/plugin.js
@@ -8,6 +8,7 @@ CKEditor 4 Changelog
* [#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.
* [#10146](http://dev.ckeditor.com/ticket/10146): [Firefox] Empty lines are being removed while config#enterMode is ENTER_BR.

## CKEditor 4.1.1

@@ -466,7 +466,9 @@
var data = fullPage ? doc.getDocumentElement().getOuterHtml() : doc.getBody().getHtml();

// BR at the end of document is bogus node for Mozilla. (#5293).
if ( CKEDITOR.env.gecko )
// Prevent BRs from disappearing from the end of the content
// while enterMode is ENTER_BR (#10146).
if ( CKEDITOR.env.gecko && config.enterMode != CKEDITOR.ENTER_BR )
data = data.replace( /<br>(?=\s*(:?$|<\/body>))/, '' );

if ( editor.dataProcessor )

0 comments on commit 89d7407

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