Changeset 256

Timestamp:

2007-04-17 12:05:01 (19 months ago)

Author:

fredck

Message:

Fixed #325 : GetXHTML should not make changes to the DOM tree.

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fckdomtools.js (modified) (1 diff)
• editor/_source/internals/fckxhtml.js (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

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

@@ -79 +79 @@
                                         {
                                                 node.removeChild( eChildNode ) ;
-
-                                                // If the node now is empty then append a   to visually keep the same appearance (#325)
-                                                if ( node.lastChild === null && FCKConfig.FillEmptyBlocks )
-                                                        node.appendChild( FCKTools.GetElementDocument( node ).createTextNode( String.fromCharCode(160) ) );
                                                 continue ;
                                         }

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

@@ -124 +124 @@
 FCKXHtml._AppendChildNodes = function( xmlNode, htmlNode, isBlockElement )
 {
+        var oNode = htmlNode.firstChild ;
+
+        while ( oNode )
+        {
+                this._AppendNode( xmlNode, oNode ) ;
+                oNode = oNode.nextSibling ;
+        }
+
         // Trim block elements. This is also needed to avoid Firefox leaving extra
         // BRs at the end of them.
         if ( isBlockElement )
-                FCKDomTools.TrimNode( htmlNode, true ) ;
-
-        var iCount = 0 ;
-
-        var oNode = htmlNode.firstChild ;
-
-        while ( oNode )
-        {
-                if ( this._AppendNode( xmlNode, oNode ) )
-                        iCount++ ;
-
-                oNode = oNode.nextSibling ;
-        }
-
-        if ( iCount == 0 )
+                FCKDomTools.TrimNode( xmlNode, true ) ;
+
+        // If the resulting node is empty.
+        if ( xmlNode.childNodes.length == 0 )
         {
                 if ( isBlockElement && FCKConfig.FillEmptyBlocks )

FCKeditor/trunk/_whatsnew.html

@@ -53 +53 @@
                         was being lost for images or comments only HTML inserted directly in the editor
                         source or loaded in the editor.</li>
-                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/388">#388</a>] Creating links in
-                        lines separated by &lt;br&gt; in IE can lead to a merge of the links.</li>
-                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/325">#325</a>] Calling the GetXHTML
-                        can distort visually the rendering in Firefox.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/388">#388</a>] Creating
+                        links in lines separated by &lt;br&gt; in IE can lead to a merge of the links.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/325">#325</a>] Calling
+                        the GetXHTML can distort visually the rendering in Firefox.</li>
         </ul>
         <h3>