Changeset 600

Timestamp:

2007-07-31 09:59:25 (18 months ago)

Author:

martinkou

Message:

Fix for #328 : Removed the <pre> tag checking logic at FCKDomTools.TrimNode().

Location:

FCKeditor/trunk/editor/_source/internals

Files:

• fckdomtools.js (modified) (1 diff)
• fckxhtml.js (modified) (1 diff)

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

@@ -37 +37 @@
         TrimNode : function( node, ignoreEndBRs )
         {
-                // If the node is a <pre>, ignore. Whitespaces in the beginning or tail of a <pre> tag
-                // shows up as in HTML code so we shouldn't delete them.
-                if ( node.nodeType == 1 && node.tagName.toLowerCase() == 'pre' )
-                        return ;
                 this.LTrimNode( node ) ;
                 this.RTrimNode( node, ignoreEndBRs ) ;

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

@@ -138 +138 @@
         // Trim block elements. This is also needed to avoid Firefox leaving extra
         // BRs at the end of them.
-        if ( isBlockElement )
+        if ( isBlockElement && htmlNode.tagName && htmlNode.tagName.toLowerCase() != 'pre' )
                 FCKDomTools.TrimNode( xmlNode, true ) ;