Changeset 525

Timestamp:

2007-07-25 03:55:38 (17 months ago)

Author:

martinkou

Message:

Fixed #404 : Line breaks within <pre> tags are incorrectly converted to <br> tags in Firefox.

Files:

• FCKeditor/trunk/editor/_source/internals/fckxhtml.js (modified) (2 diffs)

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

@@ -174 +174 @@
                 // Element Node.
                 case 1 :
+                        // If we detect a <br> inside a <pre> in Gecko, turn it into a line break instead.
+                        // This is a workaround for the Gecko bug here: https://bugzilla.mozilla.org/show_bug.cgi?id=92921
+                        if ( FCKBrowserInfo.IsGecko 
+                                        && htmlNode.tagName.toLowerCase() == 'br' 
+                                        && htmlNode.parentNode.tagName.toLowerCase() == 'pre' )
+                        {
+                                var val = '\r' ;
+                                if ( htmlNode == htmlNode.parentNode.firstChild )
+                                        val += '\r' ;
+                                return FCKXHtml._AppendNode( xmlNode, this.XML.createTextNode( val ) ) ;
+                        }
 
                         // Here we found an element that is not the real element, but a
@@ -399 +410 @@
                         var val = item.nodeValue ;
                         if ( item.nodeType == 3 && i == 0 )
-                                node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( "\r\n" + val ) ) ) ;
+                                node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( '\r\n' + val ) ) ) ;
                         else
                                 FCKXHtml._AppendNode( node, item ) ;