Changeset 1388

Timestamp:

2008-01-23 03:15:14 (9 months ago)

Author:

martinkou

Message:

Fixed #503 : Fixed orphaned <li> elements after pasting unordered list items in IE.

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fck.js (modified) (2 diffs)
• editor/_source/internals/fckxhtml.js (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

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

@@ -177 +177 @@
                                 // Element Node.
                                 case 1 :
-                                        if ( !FCKListsLib.BlockElements[ oNode.nodeName.toLowerCase() ] && 
+                                        var nodeName = oNode.nodeName.toLowerCase() ;
+                                        if ( !FCKListsLib.BlockElements[ nodeName ] && 
+                                                        nodeName != 'li' &&
                                                         !oNode.getAttribute('_fckfakelement') &&
                                                         oNode.getAttribute('_moz_dirty') == null )
@@ -1160 +1162 @@
 
 
+

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

@@ -404 +404 @@
         },
 
+        // Fix orphaned <li> nodes (Bug #503).
+        li : function( node, htmlNode, targetNode )
+        {
+                // If the XML parent node is already a <ul> or <ol>, then add the <li> as usual.
+                if ( targetNode.nodeName.IEquals( ['ul', 'ol'] ) )
+                        return FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
+
+                var newTarget = FCKXHtml.XML.createElement( 'ul' ) ;
+
+                // Reset the _fckxhtmljob so the HTML node is processed again.
+                htmlNode._fckxhtmljob = null ; 
+
+                // Loop through all sibling LIs, adding them to the <ul>.
+                do
+                {
+                        FCKXHtml._AppendNode( newTarget, htmlNode ) ;
+                        
+                        // Look for the next element following this <li>.
+                        do
+                        {
+                                htmlNode = FCKDomTools.GetNextSibling( htmlNode ) ;
+                        }
+                        while ( htmlNode && htmlNode.nodeType == 3 && htmlNode.nodeValue.Trim().length == 0 )
+                }
+                while ( htmlNode && htmlNode.nodeName.toLowerCase() == 'li' )
+
+                return newTarget ;
+        },
+
         // Fix nested <ul> and <ol>.
         ol : function( node, htmlNode, targetNode )

FCKeditor/trunk/_whatsnew.html

@@ -56 +56 @@
                         are now being properly shown in Firefox Mac when placing FCKeditor inside a hidden
                         div.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/503">#503</a>] Orphaned
+                        &lt;li&gt; elements now get properly enclosed in a &lt;ul&gt; on output.</li>
         </ul>
         <p>