Ticket #3441: 3441_3.patch

_source/plugins/htmlwriter/plugin.js

@@ -195 +195 @@
                  * // Writes "Hello Word".
                  * writer.text( 'Hello Word' );
                  */
-                text : function( text )
+                text : function( text, isCDATA )
                 {
                         if ( this._.indent )
                         {
@@ -202 +202 @@
                                 this.indentation();
                                 text = CKEDITOR.tools.ltrim( text );
                         }
-
-                        this._.output.push( text );
+                        if ( isCDATA )
+                                this._.output.push( '<![CDATA[', text, ']]>' );
+                        else
+                                this._.output.push( text );
                 },
 
                 /**

_source/core/htmlparser/text.js

@@ -5 +5 @@
 
 (function()
 {
-        var spacesRegex = /[\t\r\n ]{2,}|[\t\r\n]/g;
+        // cdataNode : Element tag names which contains CDATA data type.
+        var spacesRegex = /[\t\r\n ]{2,}|[\t\r\n]/g,
+                cdataNode = { script : 1, style : 1 };          
 
         /**
          * A lightweight representation of HTML text.
@@ -12 +14 @@
          * @constructor
          * @example
          */
-        CKEDITOR.htmlParser.text = function( value )
+        CKEDITOR.htmlParser.text = function( value )
         {
                 /**
                  * The text value.
@@ -44 +46 @@
                  */
                 writeHtml : function( writer, filter )
                 {
-                        var text = this.value;
+                        var text = this.value,
+                                textType =
+                                        this.parent.name in cdataNode ? 'CDATA' : 'Text';
 
-                        if ( filter && !( text = filter.onText( text ) ) )
+                        if ( filter && !( text = filter[ 'on' + textType ].call( filter, text ) ) )
                                 return;
 
-                        writer.text( text );
+                        writer.text( text, textType  == 'CDATA' ); 
                 }
         };
 })();

_source/core/htmlparser/filter.js

@@ -56 +56 @@
                         {
                                 return filterName( name, this._.attributeNames );
                         },
-
+                        
+                        /**
+                         * Filtering text node content. 
+                         * @param {Object} text The text content.
+                         */
                         onText : function( text )
                         {
                                 var textFilter = this._.text;
@@ -62 +66 @@
                                 var textFilter = this._.text;
                                 return textFilter ? textFilter.filter( text ) : text;
                         },
+        
+                        /**
+                         * Filtering CDATA section content. 
+                         */
+                        onCDATA : function( cdata )
+                        {
+                                var filter = this._.cdata;
+                                return filter ? filter.filter( cdata ) : cdata;
+                        },
 
                         onComment : function( commentText )
                         {