Changeset 1219

Timestamp:

2007-12-18 11:36:34 (2 years ago)

Author:

fredck

Message:

Fixed #1664 : The ENTER key will not any more swap the order of the tags when hit at the end of paragraphs.

Location:

FCKeditor/trunk

Files:

• editor/_source/classes/fckenterkey.js (modified) (2 diffs)
• editor/_source/internals/fckdomtools.js (modified) (2 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/_source/classes/fckenterkey.js

@@ -462 +462 @@
                         if ( elementPath )
                         {
-                                var eFocusElement = eNewBlock ;
                                 for ( var i = 0, len = elementPath.Elements.length ; i < len ; i++ )
                                 {
@@ -469 +468 @@
                                         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 ) ;
+                                        }
                                 }
                         }

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

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

FCKeditor/trunk/_whatsnew.html

@@ -62 +62 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1603">#1603</a>] Certain
                         specific markup was making FCKeditor entering in a loop, blocking its execution.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1664">#1664</a>] The ENTER
+                        key will not any more swap the order of the tags when hit at the end of paragraphs.</li>
         </ul>
         <p>