Changeset 523

Timestamp:

2007-07-25 02:23:29 (3 years ago)

Author:

martinkou

Message:

Simplified logic to retrive the HTML tag in fck.js.
Fix for #328 : Fixed the issue where the first line break immediately after a <pre> tag is chopped off after switching back and forth between Source and WYSIWYG mode.

Location:

FCKeditor/trunk/editor/_source/internals

Files:

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

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

@@ -223 +223 @@
                 // Call the Data Processor to generate the output data.
                 var data = FCK.DataProcessor.ConvertToDataFormat(
-                        isFullPage ? oDoc.getElementsByTagName( 'html' )[0] : oDoc.body,
+                        isFullPage ? oDoc.documentElement : oDoc.body,
                         !isFullPage,
                         FCKConfig.IgnoreEmptyParagraphValue,

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

@@ -392 +392 @@
         },
 
+        pre : function ( node, htmlNode)
+        {
+                for ( var i = 0 ; i < htmlNode.childNodes.length ; i++ )
+                {
+                        var item = htmlNode.childNodes[i] ;
+                        var val = item.nodeValue ;
+                        if ( i == 0 )
+                                val = "\r\n" + val ;
+                        if ( item.nodeType == 3 )
+                                node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( val ) ) ) ;
+                        else
+                                FCKXHtml._AppendNode( node, item ) ;
+                }
+                return node ;
+        },
+
         title : function( node, htmlNode )
         {