Ticket #3441: 3441_5.patch

_source/core/htmlparser/text.js

@@ -5 +5 @@
 
 (function()
 {
+        // cdataNode : Element tag names which contains CDATA data type.
         var spacesRegex = /[\t\r\n ]{2,}|[\t\r\n]/g;
 
         /**
@@ -12 +13 @@
          * @constructor
          * @example
          */
-        CKEDITOR.htmlParser.text = function( value )
+        CKEDITOR.htmlParser.text = function( value )
         {
                 /**
                  * The text value.
@@ -44 +45 @@
                  */
                 writeHtml : function( writer, filter )
                 {
-                        var text = this.value;
+                        var text = this.value,
+                                textType =
+                                        this.parent.name in CKEDITOR.dtd.$cdata ? '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 )
                         {

_source/core/htmlparser.js

@@ -101 +102 @@
                 {
                         var parts,
                                 tagName,
-                                nextIndex = 0;
+                                nextIndex = 0,
+                                cdataMode = false,
+                                cdataText = []; // The collected text content inside CDATA Section.
 
                         while ( ( parts = this._.htmlPartsRegex.exec( html ) ) )
                         {
@@ -107 +110 @@
                         {
                                 var tagIndex = parts.index;
                                 if ( tagIndex > nextIndex )
-                                        this.onText( html.substring( nextIndex, tagIndex ) );
-
-                                nextIndex = this._.htmlPartsRegex.lastIndex;
-
+                                {
+                                        var text = html.substring( nextIndex, tagIndex );
+                                        if ( cdataMode )
+                                                cdataText.push( text );                                 
+                                        else
+                                                this.onText( text );
+                                }
+                                
                                 /*
                                  "parts" is an array with the following items:
-                                        0 : The entire match (not used)
+                                        0 : The entire match for opening/closing tags.
                                         1 : Group filled with the tag name for closing tags.
                                         2 : Group filled with the comment text.
                                         3 : Group filled with the tag name for opening tags.
@@ -119 +126 @@
                                         3 : Group filled with the tag name for opening tags.
                                         4 : Group filled with the attributes part of opening tags.
                                  */
+                                nextIndex = this._.htmlPartsRegex.lastIndex;
+                                // Treate tags as plain text.
+                                if ( cdataMode )
+                                        nextIndex-= parts[ 0 ].length;
 
                                 // Closing tag
                                 if ( ( tagName = parts[ 1 ] ) )
@@ -123 +134 @@
                                 // Closing tag
                                 if ( ( tagName = parts[ 1 ] ) )
                                 {
-                                        this.onTagClose( tagName.toLowerCase() );
+                                        if ( !cdataMode || tagName in CKEDITOR.dtd.$cdata )
+                                        {
+                                                if ( cdataMode )
+                                                {
+                                                        // Creating CDATA text.
+                                                        this.onText( cdataText.join('') );
+                                                        nextIndex+= parts[ 0 ].length;
+                                                        cdataText = [];
+                                                        cdataMode = false;
+                                                }
+                                                this.onTagClose( tagName.toLowerCase() );
+                                        }
                                         continue;
                                 }
 
+                                // Ignore all tags matching inside CDATA section.
+                                if ( cdataMode )
+                                        continue;
+
                                 // Opening tag
                                 if ( ( tagName = parts[ 3 ] ) )
                                 {
@@ -148 +174 @@
                                                                 attribs[ attName ] = attValue;
                                                 }
                                         }
+                                        
+                                        this.onTagOpen( tagName.toLowerCase(), attribs, selfClosing );
 
-                                        this.onTagOpen( tagName.toLowerCase(), attribs, selfClosing );
+                                        // Open CDATA    mode when encounting accordinate tags.
+                                        if ( tagName in CKEDITOR.dtd.$cdata )
+                                                cdataMode = true;
                                         continue;
                                 }
 
@@ -156 +186 @@
                                 // Comment
                                 if( ( tagName = parts[ 2 ] ) )
                                         this.onComment( tagName );
+                                
                         }
 
                         if ( html.length > nextIndex )

_source/core/dtd.js

@@ -67 +67 @@
                 $block : block,
 
                 $body : X({script:1}, block),
-
+                
+                $cdata : { script:1,style:1},
                 /**
                  * List of empty (self-closing) elements, like "br" or "img".
                  * @type Object