Ticket #3407: 3407_5.patch

_source/core/config.js

@@ -170 +170 @@
          * config.removePlugins = 'elementspath,save,font';
          */
         removePlugins : '',
+        
+        /**
+         * List of regular expressions to be executed over the input HTML,
+         * indicating code that must stay untouched.
+         * @type Array
+         * @example
+         * config.protectedSource.push( /<\?[\s\S]*?\?>/g );   // PHP Code 
+         * config.protectedSource.push( /<%[\s\S]*?%>/g );   // ASP Code 
+         * config.protectedSource.push( /(<asp:[^\>]+>[\s|\S]*?<\/asp:[^\>]+>)|(<asp:[^\>]+\/>)/gi );   // ASP.Net Code 
+         */
+        protectedSource : [],
 
         /**
          * The editor tabindex value.

_source/core/htmlparser/comment.js

@@ -42 +42 @@
         {
                 var comment = this.value;
 
-                if ( filter && !( comment = filter.onComment( comment ) ) )
-                        return;
+                if ( filter )
+                {
+                        if ( !( comment = filter.onComment( comment ) ) )
+                                return;
+                        
+                        if ( typeof comment != 'string' )
+                        {
+                                comment.writeHtml( writer, filter );
+                                return;
+                        }
+                }
 
                 writer.comment( comment );
         }

_source/plugins/htmldataprocessor/plugin.js

@@ -8 +8 @@
         // Regex to scan for   at the end of blocks, which are actually placeholders.
         var tailNbspRegex = /^[\t\r\n ]* $/;
 
+        var protectedSourceMarker = '{cke_protected}';
+
         function trimFillers( block, fromSource )
         {
                 // If the current node is a block, and if we're converting from source or
@@ -168 +170 @@
                                         // Remove all class names starting with "cke_".
                                         return CKEDITOR.tools.ltrim( value.replace( /(?:^|\s+)cke_[^\s]*/g, '' ) ) || false;
                                 }
+                        },
+
+                        comment : function( contents )
+                        {
+                                if ( contents.substr( 0, protectedSourceMarker.length ) == protectedSourceMarker )
+                                        return new CKEDITOR.htmlParser.cdata( decodeURIComponent( contents.substr( protectedSourceMarker.length ) ) );
+
+                                return contents;
                         }
                 };
 
@@ -216 +226 @@
                 return html.replace( encodedTagsRegex, unprotectEncodedTagsMatch );
         }
 
+        function protectSource( data, protectRegexes )
+        {
+                var regexes =
+                        [
+                                // First of any other protection, we must protect all comments
+                                // to avoid loosing them (of course, IE related).
+                                /<!--[\s\S]*?-->/g,
+
+                                // Script tags will also be forced to be protected, otherwise
+                                // IE will execute them.
+                                /<script[\s\S]*?<\/script>/gi,
+
+                                // <noscript> tags (get lost in IE and messed up in FF).
+                                /<noscript[\s\S]*?<\/noscript>/gi
+                        ]
+                        .concat( protectRegexes );
+                
+                for ( var i = 0 ; i < regexes.length ; i++ )
+                {
+                        data = data.replace( regexes[i], function( match )
+                                {
+                                        return '<!--' + protectedSourceMarker + encodeURIComponent( match ).replace( /--/g, '%2D%2D' ) + '-->';
+                                });
+                }
+                
+                return data;
+        }
+
         CKEDITOR.plugins.add( 'htmldataprocessor',
         {
                 requires : [ 'htmlwriter' ],
 
                 init : function( editor )
                 {
-                        var dataProcessor = editor.dataProcessor = new CKEDITOR.htmlDataProcessor();
+                        var dataProcessor = editor.dataProcessor = new CKEDITOR.htmlDataProcessor( editor );
 
                         dataProcessor.writer.forceSimpleAmpersand = editor.config.forceSimpleAmpersand;
 
@@ -233 +271 @@
                 }
         });
 
-        CKEDITOR.htmlDataProcessor = function()
+        CKEDITOR.htmlDataProcessor = function( editor )
         {
+                this.editor = editor;
+
                 this.writer = new CKEDITOR.htmlWriter();
                 this.dataFilter = new CKEDITOR.htmlParser.filter();
                 this.htmlFilter = new CKEDITOR.htmlParser.filter();
@@ -247 +287 @@
                         // The source data is already HTML, but we need to clean
                         // it up and apply the filter.
 
+                        data = protectSource( data, this.editor.config.protectedSource );
+
                         // Before anything, we must protect the URL attributes as the
                         // browser may changing them when setting the innerHTML later in
                         // the code.