Ticket #3715: 3715.patch

_source/core/htmlparser/element.js

@@ -36 +36 @@
 
         var dtd                 = CKEDITOR.dtd,
                 isBlockLike     = !!( dtd.$block[ name ] || dtd.$listItem[ name ] || dtd.$tableContent[ name ] ),
+                isPre = name == 'pre';
                 isEmpty         = !!dtd.$empty[ name ];
 
         this.isEmpty    = isEmpty;
@@ -45 +46 @@
         this._ =
         {
                 isBlockLike : isBlockLike,
+                isPre : isPre,
                 hasInlineStarted : isEmpty || !isBlockLike
         };
 };
@@ -124 +126 @@
                                         if ( !( element = filter.onElement( element ) ) )
                                                 return;
 
-                                        if ( element.name == writeName )
+                                        // Element already get serialized.
+                                        if ( typeof element == 'string' )
+                                        {
+                                                writer.write(element);
+                                                return;
+                                        }
+                                        else if ( element.name == writeName )
                                                 break;
 
                                         writeName = element.name;

_source/core/htmlparser/text.js

@@ -19 +19 @@
                  * @type String
                  * @example
                  */
-                this.value = value.replace( spacesRegex, ' ' );
+                this.value = value;
 
                 /** @private */
                 this._ =
@@ -46 +46 @@
                 {
                         var text = this.value;
 
-                        if ( filter && !( text = filter.onText( text ) ) )
+                        if ( filter && !( text = filter.onText( text, this ) ) )
                                 return;
-
                         writer.text( text );
                 }
         };

_source/core/htmlparser/fragment.js

@@ -118 +118 @@
                         }
 
                         // Rtrim empty spaces on block end boundary. (#3585)
-                        if ( element._.isBlockLike )
+                        if ( element._.isBlockLike
+                                 && !element._.isPre )
                         {
-
                                 var length = element.children.length,
                                         lastChild = element.children[ length - 1 ],
                                         text;

_source/core/htmlparser/filter.js

@@ -57 +57 @@
                                 return filterName( name, this._.attributeNames );
                         },
 
-                        onText : function( text )
+                        onText : function( text , node )
                         {
                                 var textFilter = this._.text;
-                                return textFilter ? textFilter.filter( text ) : text;
+                                return textFilter ? textFilter.filter( text, node ) : text;
                         },
 
                         onComment : function( commentText )
@@ -87 +87 @@
                                                 if ( ret === false )
                                                         return null;
 
+                                                // Element might been transformed into text node.
+                                                if( ret && ret.type == CKEDITOR.NODE_TEXT )
+                                                        return this.onText( ret.value, ret );
+                                                
                                                 if ( ret && ret != element )
                                                         return this.onElement( ret );
                                         }
@@ -212 +216 @@
                                 if ( ret === false )
                                         return false;
 
-                                if ( isObject && ret != currentEntry )
+                                // 1. Stop further filtering if current filter has changed the
+                                // element.
+                                // 2. Make sure we safely return last filtering result.
+                                if ( isObject && ret != currentEntry
+                                        || i == this.length -1 )
                                         return ret;
                         }
                 }

_source/plugins/htmldataprocessor/plugin.js

@@ -56 +56 @@
                         block.add( new CKEDITOR.htmlParser.text( '\xa0' ) );
         }
 
+        /**
+         * Filter function for shrinking consequential spaces into one single white
+         * space in text node.
+         * Note: This behavior is IE's default treatment for all text node within
+         * non-pre, we generalize to all browers to reach consistent result.
+         * @param text
+         */
+        function compressSpaces( text , node )
+        {
+                if ( node.parent.name != 'pre' )
+                        return text.replace( /[\t\r\n ]{2,}|[\t\r\n]/g, ' ' );
+                else
+                        return text;
+        }
+
         var dtd = CKEDITOR.dtd;
         
         // Find out the list of block-like tags that can contain <br>.
@@ -65 +80 @@
                 if ( ! ( 'br' in dtd[i] ) )
                         delete blockLikeTags[i];
         }
-
+        // We just avoid filler in <pre> right now.
+        // TODO: Support filler for <pre>, line break is also occupy line height.
+        delete blockLikeTags.pre;
         var defaultDataFilterRules =
         {
                 elementNames :
@@ -82 +99 @@
                 ]
         };
 
+        defaultDataFilterRules.text = compressSpaces;
+
         var defaultDataBlockFilterRules = { elements : {} };
 
         for ( var i in blockLikeTags )
@@ -120 +139 @@
 
                         elements :
                         {
+                                br : function( node )
+                                {
+                                        // Gecko had been replacing all linebreaks into <br>s, which
+                                        // are required to be restored here.
+                                        if ( node.parent.name == 'pre' )
+                                        {
+                                                var parent = node.parent;
+                                                node = new CKEDITOR.htmlParser.text( '\n' );
+                                                node.parent = parent;
+                                        }
+                                        return node;
+                                },
+
                                 embed : function( element )
                                 {
                                         var parent = element.parent;
@@ -169 +201 @@
                         }
                 };
 
+        defaultHtmlFilterRules.text = compressSpaces;
         var defaultHtmlBlockFilterRules = { elements : {} };
         
         for ( var i in blockLikeTags )
@@ -211 +244 @@
         CKEDITOR.htmlDataProcessor = function()
         {
                 this.writer = new CKEDITOR.htmlWriter();
+                // Disable indentation on <pre>.
+                this.writer.setRules( 'pre',
+                {
+                  indent: false
+                } );
                 this.dataFilter = new CKEDITOR.htmlParser.filter();
                 this.htmlFilter = new CKEDITOR.htmlParser.filter();
         };