Ticket #3801: 3801_6.patch

CHANGES.html

@@ -78 +78 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3829">#3829</a> : Fixed remove empty link on output data.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3730">#3730</a> : Indent is performing on the whole
                         block instead of selected lines in enterMode = BR.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3801">#3801</a> : Comments at the start of the document was lost in IE.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>

_source/tests/plugins/htmldataprocessor/htmldataprocessor.html

@@ -270 +270 @@
                                 dataProcessor.toDataFormat( protectedHtml ) );
                 },
 
+                test_innerHtmlComments_ticket_3801 : function()
+                {
+                        var editor = CKEDITOR.instances.editor1,
+                                dataProcessor = editor.dataProcessor;
 
+                        dataProcessor.writer = new CKEDITOR.htmlParser.basicWriter();
+
+                        for ( var i = 1; i <= 7; i++ )
+                        {
+                                var html = getTextAreaValue( '_TEXTAREA_3801_' + i );
+                                var protectedHtml = dataProcessor.toHtml( html );
+
+                                assert.areSame( getTextAreaValue( '_TEXTAREA_3801_' + i ),
+                                        dataProcessor.toDataFormat( protectedHtml ) );
+                        }
+                },
+
+
                 name : document.title
         };
 })() );
@@ -290 +307 @@
         <textarea id="_TEXTAREA_3591"><object><param /><param /><embed></embed></object></textarea>
         <textarea id="_TEXTAREA_3591_protected"><cke:object><cke:param></cke:param><cke:param></cke:param><cke:embed></cke:embed></cke:object></textarea>
         <textarea id="_TEXTAREA_3591_2"><object classid="clsid"><param name="movie" value="movie.swf" /><embed src="movie.swf" type="application/x-shockwave-flash"></embed></object></textarea>
+        <textarea id="_TEXTAREA_3801_1"><!-- foo --><p>bar</p></textarea>
+        <textarea id="_TEXTAREA_3801_2"><p><!-- foo -->bar</p></textarea>
+        <textarea id="_TEXTAREA_3801_3"><!-- foo --><p><!-- foo -->bar</p></textarea>
+        <textarea id="_TEXTAREA_3801_4"><p>bar</p><!-- foo --></textarea>
+        <textarea id="_TEXTAREA_3801_5">bar<!-- foo --></textarea>
+        <textarea id="_TEXTAREA_3801_6"><!-- foo -->bar</textarea>
+        <textarea id="_TEXTAREA_3801_7"><p><!-- foo -->bar</p><p><!-- foo -->bar</p></textarea>
 </body>
 </html>

_source/plugins/htmldataprocessor/plugin.js

@@ -311 +311 @@
                         // Call the browser to help us fixing a possibly invalid HTML
                         // structure.
                         var div = document.createElement( 'div' );
-                        div.innerHTML = data;
-                        data = div.innerHTML;
+                        // Add fake character to workaround IE comments bug. (#3801)
+                        div.innerHTML = 'a' + data;
+                        data = div.innerHTML.substr( 1 );
 
                         if ( CKEDITOR.env.ie )
                                 data = unprotectEncodedTags( data );