Changeset 1032

Timestamp:

2007-10-17 07:53:13 (2 years ago)

Author:

martinkou

Message:

Fixed #1414: Merged Fred's simpler solution to the bug.

Files:

• FCKeditor/trunk/editor/_source/internals/fckxhtml.js (modified) (1 diff)

FCKeditor/trunk/editor/_source/internals/fckxhtml.js

@@ -378 +378 @@
         pre : function ( node, htmlNode )
         {
-                for ( var i = 0 ; i < htmlNode.childNodes.length ; i++ )
-                {
-                        var item = htmlNode.childNodes[i] ;
-                        var val = item.nodeValue ;
-                        if ( item.nodeType == 3 && i == 0 )
-                        {
-                                // We shouldn't put the plain text value of the text node directly into HTML. (See #1414)
-                                var dummyNode = document.createElement( 'pre' ) ;
-                                dummyNode.appendChild( document.createTextNode( val ) ) ;
-                                node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( '\r\n' + dummyNode.innerHTML ) ) ) ;
-                        }
-                        else
-                                FCKXHtml._AppendNode( node, item ) ;
-                }
+                var firstChild = htmlNode.firstChild ;
+
+                if ( firstChild && firstChild.nodeType == 3 )
+                        node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( '\r\n' ) ) ) ;
+
+                FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
+
                 return node ;
         },