Changeset 848

Timestamp:

09/19/07 18:05:47 (6 years ago)

Author:

martinkou

Message:

Improved the safety of the indenting commands.

Location:

FCKeditor/trunk/editor/_source

Files:

• commandclasses/fckindentcommands.js (modified) (1 diff)
• internals/fckdomtools.js (modified) (2 diffs)

FCKeditor/trunk/editor/_source/commandclasses/fckindentcommands.js

@@ -268 +268 @@
                 // And replace the old list with the new forest.
                 var newList = FCKDomTools.ArrayToList( listArray ) ;
-                listNode.parentNode.replaceChild( newList.listNode, listNode ) ;
+                if ( newList )
+                        listNode.parentNode.replaceChild( newList.listNode, listNode ) ;
 
                 // Clean up the markers.

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

@@ -645 +645 @@
         },
 
-        // Convert our internal representation of a list back to a DOM tree.
+        // Convert our internal representation of a list back to a DOM forest.
         ArrayToList : function( listArray, baseIndex )
         {
@@ -702 +702 @@
                         }
                         else
-                                break ;
+                                return null ;
 
                         if ( listArray.length <= currentIndex || Math.max( listArray[currentIndex].indent, 0 ) < indentLevel )