Ticket #1664: 1664.patch

_whatsnew.html

@@ -57 +57 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/339">#339</a>] [<a
                         target="_blank" href="http://dev.fckeditor.net/ticket/681">#681</a>] The SpellerPages
                         spell checker will now completely ignore the presence of HTML tags in the text.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1664">#1664</a>] The ENTER
+                        key will not anymore swap the order of the tags when hit at the end of paragraphs.</li>
         </ul>
         <p>
                 <a href="_whatsnew_history.html">See previous versions history</a>

editor/_source/classes/fckenterkey.js

@@ -461 +461 @@
                         var elementPath = oSplitInfo.ElementPath ;
                         if ( elementPath )
                         {
-                                var eFocusElement = eNewBlock ;
                                 for ( var i = 0, len = elementPath.Elements.length ; i < len ; i++ )
                                 {
                                         var element = elementPath.Elements[i] ;
 
                                         if ( element == elementPath.Block || element == elementPath.BlockLimit )
                                                 break ;
-
+                                        
                                         if ( FCKListsLib.InlineChildReqElements[ element.nodeName.toLowerCase() ] )
-                                                eFocusElement = eFocusElement.appendChild( FCKDomTools.CloneElement( element ) ) ;
+                                        {
+                                                element = FCKDomTools.CloneElement( element ) ;
+                                                FCKDomTools.MoveChildren( eNewBlock, element ) ;
+                                                eNewBlock.appendChild( element ) ;
+                                        }
                                 }
                         }
 

editor/_source/internals/fckdomtools.js

@@ -23 +23 @@
 
 var FCKDomTools =
 {
+        /**
+         * Move all child nodes from one node to another.
+         */
         MoveChildren : function( source, target, toTargetStart )
         {
                 if ( source == target )