Ticket #4475: 4475.patch

_source/plugins/htmldataprocessor/plugin.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -200 +200 @@
                                         // Remove all class names starting with "cke_".
                                         return CKEDITOR.tools.ltrim( value.replace( /(?:^|\s+)cke_[^\s]*/g, '' ) ) || false;
                                 }
-                        },
-
-                        comment : function( contents )
-                        {
-                                // If this is a comment for protected source.
-                                if ( contents.substr( 0, protectedSourceMarker.length ) == protectedSourceMarker )
-                                {
-                                        // Remove the extra marker for real comments from it.
-                                        if ( contents.substr( protectedSourceMarker.length, 3 ) == '{C}' )
-                                                contents = contents.substr( protectedSourceMarker.length + 3 );
-                                        else
-                                                contents = contents.substr( protectedSourceMarker.length );
-
-                                        return new CKEDITOR.htmlParser.cdata( decodeURIComponent( contents ) );
-                                }
-
-                                return contents;
                         }
                 };
 
@@ -300 +283 @@
                         });
         }
 
+        function unprotectSource( html )
+        {
+                html = html.replace( /<!--\{cke_protected\}([\s\S]+?)-->/g, function( match, data )
+                        {
+                                return decodeURIComponent( data );
+                        });
+
+                // If the protected source was set on an attribute, the < and > will be encoded
+                return html.replace( /&lt;!--\{cke_protected\}([\s\S]+?)--&gt;/g, function( match, data )
+                        {
+                                return decodeURIComponent( data );
+                        });
+        }
+
         function protectSource( data, protectRegexes )
         {
                 var protectedHtml = [],
@@ -440 +437 @@
 
                         fragment.writeHtml( writer, this.htmlFilter );
 
-                        return writer.getHtml( true );
+                        var data = writer.getHtml( true );
+
+                        // Restore the data that has been protected
+                        data = unprotectRealComments( data );
+                        data = unprotectSource( data );
+
+                        return data;
                 }
         };
 })();