Ticket #3874: 3874.patch

_source/core/tools.js

@@ -227 +227 @@
                                 return span.getHtml();
                         };
 
-                        var fix1 = ( standard( '>' ) == '>' ) ?
+                        var fix1 = ( standard( '\n' ).toLowerCase() == '<br>' ) ?
                                 function( text )
                                 {
+                                        // #3874 IE and Safari encode line-break into <br>
+                                        return standard( text ).replace( /<br>/gi, '\n' );
+                                } :
+                                standard;
+
+                        var fix2 = ( standard( '>' ) == '>' ) ?
+                                function( text )
+                                {
                                         // WebKit does't encode the ">" character, which makes sense, but
                                         // it's different than other browsers.
-                                        return standard( text ).replace( />/g, '&gt;' );
+                                        return fix1( text ).replace( />/g, '&gt;' );
                                 } :
-                                standard;
+                                fix1;
 
-                        var fixNbsp = /&nbsp;/g;
-                        var fix2 = ( standard( '  ' ) == '&nbsp; ' ) ?
+                        var fix3 = ( standard( '  ' ) == '&nbsp; ' ) ?
                                 function( text )
                                 {
                                         // #3785 IE8 changes spaces (>= 2) to &nbsp;
-                                        return fix1( text ).replace( fixNbsp, ' ' );
+                                        return fix2( text ).replace( /&nbsp;/g, ' ' );
                                 } :
-                                fix1;
-
-                        this.htmlEncode = fix2;
+                                fix2;
+                        
+                        this.htmlEncode = fix3;
 
                         return this.htmlEncode( text );
                 },

_source/tests/core/tools.html

@@ -9 +9 @@
         <script type="text/javascript" src="../test.js"></script>
         <script type="text/javascript">
         //<![CDATA[
-
-CKEDITOR.test.addTestCase( (function()
+var testcase;
+CKEDITOR.test.addTestCase( testcase = (function()
 {
         // Local reference to the "assert" object.
         var assert = CKEDITOR.test.assert;
@@ -77 +77 @@
                         assert.areSame( 'Test\'s &amp; "quote"', CKEDITOR.tools.htmlEncode( 'Test\'s & "quote"' ) );
                 },
 
+                test_htmlEncode_3874 : function()
+                {
+                        assert.areSame( 'line1\nline2', CKEDITOR.tools.htmlEncode( 'line1\nline2' ) );
+                },
+
                 test_cssStyleToDomStyle1 : function()
                 {
                         assert.areSame( 'backgroundColor', CKEDITOR.tools.cssStyleToDomStyle( 'background-color' ) );
@@ -152 +157 @@
                 name : document.title
         };
 })() );
-
+//window.onload = testcase.test_htmlEncode_3874;
         //]]>
         </script>
 </head>

CHANGES.html

@@ -88 +88 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3825">#3825</a> : Fixed JS error when opening spellingcheck.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3862">#3862</a> : Fixed html parser infinite loop on certain malformed 
                         source code.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3874">#3874</a> : Paste as plain text in Safari loosing lines.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>