Ticket #4475: 4475_2.patch

_source/plugins/wysiwygarea/plugin.js

@@ -902 +902 @@
                                                         loadData : function( data )
                                                         {
                                                                 isLoadingData = true;
+                                                                editor._.dataStore = { id : 1 };
 
                                                                 var config = editor.config,
                                                                         fullPage = config.fullPage,

_source/plugins/htmldataprocessor/plugin.js

@@ -238 +238 @@
                                         // 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;
-                        }
+                        }
                 };
 
         if ( CKEDITOR.env.ie )
@@ -379 +362 @@
                         });
         }
 
-        function protectSource( data, protectRegexes )
+        function unprotectSource( html, editor )
         {
+                var store = editor._.dataStore;
+                return html.replace( /<!--\{cke_protected\}([\s\S]+?)-->/g, function( match, data )
+                        {
+                                return decodeURIComponent( data );
+                        }).replace( /\{cke_protected_(\d+)\}/g, function( match, id )
+                        {
+                                return store[ id ];
+                        });
+        }
+
+        function protectSource( data, editor )
+        {
                 var protectedHtml = [],
+                        protectRegexes = editor.config.protectedSource,
+                        store = editor._.dataStore,
                         tempRegex = /<\!--\{cke_temp(comment)?\}(\d*?)-->/g;
 
                 var regexes =
@@ -414 +411 @@
                                                         return protectedHtml[ id ];
                                                 }
                                         );
-                                        return  '<!--{cke_temp}' + ( protectedHtml.push( match ) - 1 ) + '-->';
+
+                                        // Avoid protecting over protected, e.g. /\{.*?\}/
+                                        return /cke_temp(comment)?/.test( match ) ? match
+                                                : '<!--{cke_temp}' + ( protectedHtml.push( match ) - 1 ) + '-->';
                                 });
                 }
                 data = data.replace( tempRegex, function( $, isComment, id )
@@ -425 +425 @@
                                                 '-->';
                         }
                 );
-                return data;
+
+                // Different protection pattern is used for those that
+                // live in attributes to avoid from being HTML encoded.
+                return data.replace( /(['"]).*?\1/g, function ( match )
+                {
+                        return match.replace( /<!--\{cke_protected\}([\s\S]+?)-->/g, function( match, data )
+                        {
+                                store[ store.id ] = decodeURIComponent( data );
+                                return '{cke_protected_'+ store.id++  + '}';
+                        })
+                });
         }
 
         CKEDITOR.plugins.add( 'htmldataprocessor',
@@ -471 +481 @@
                         // The source data is already HTML, but we need to clean
                         // it up and apply the filter.
 
-                        data = protectSource( data, this.editor.config.protectedSource );
+                        data = protectSource( data, this.editor );
 
                         // Before anything, we must protect the URL attributes as the
                         // browser may changing them when setting the innerHTML later in
@@ -533 +543 @@
 
                         fragment.writeHtml( writer, this.htmlFilter );
 
-                        return writer.getHtml( true );
+                        var data = writer.getHtml( true );
+
+                        // Restore those non-HTML protected source. (#4475,#4880)
+                        data = unprotectRealComments( data );
+                        data = unprotectSource( data, this.editor );
+
+                        return data;
                 }
         };
 })();