Ticket #3801: 3801_5.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 <= 6; 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>
 </body>
 </html>

_source/plugins/htmldataprocessor/plugin.js

@@ -195 +195 @@
                 return html.replace( protectAttributeRegex, '$& _cke_saved_$1' );
         }
 
-        var protectStyleTagsRegex = /<(style)(?=[ >])[^>]*>[^<]*<\/\1>/gi;
+        var protectTagsRegex = /<(style)(?=[ >])[^>]*>[^<]*<\/\1>|<!--([\s\S]*?)-->/gi;
         var encodedTagsRegex = /<cke:encoded>([^<]*)<\/cke:encoded>/gi;
         var protectElementNamesRegex = /(<\/?)((?:object|embed|param).*?>)/gi;
         var protectSelfClosingRegex = /<cke:param(.*?)\/>/gi;
 
-        function protectStyleTagsMatch( match )
+        function protectTagsMatch( match )
         {
                 return '<cke:encoded>' + encodeURIComponent( match ) + '</cke:encoded>';
         }
 
-        function protectStyleTags( html )
+        function protectTags( html )
         {
-                return html.replace( protectStyleTagsRegex, protectStyleTagsMatch );
+                return html.replace( protectTagsRegex, protectTagsMatch );
         }
         function protectElementsNames( html )
         {
@@ -296 +296 @@
                         // the code.
                         data = protectAttributes( data );
 
-                        // IE remvoes style tags from innerHTML. (#3710).
+                        // IE remvoes style tags an comments from innerHTML. (#3710 & #3801).
                         if ( CKEDITOR.env.ie )
-                                data = protectStyleTags( data );
+                                data = protectTags( data );
 
                         // Certain elements has problem to go through DOM operation, protect
                         // them by prefixing 'cke' namespace.(#3591)
@@ -310 +310 @@
 
                         // Call the browser to help us fixing a possibly invalid HTML
                         // structure.
-                        var div = document.createElement( 'div' );
-                        div.innerHTML = data;
-                        data = div.innerHTML;
+                        var div = new CKEDITOR.dom.element( 'div' );
+                        div.setHtml( data );
+                        data = div.getHtml();
 
                         if ( CKEDITOR.env.ie )
                                 data = unprotectEncodedTags( data );