Changeset 1051

Timestamp:

10/30/07 14:04:36 (6 years ago)

Author:

fredck

Message:

Fixed #1419 : The FCKDomTools.GetNextSourceElement was wrongly ignoring child elements of ignored elements. For example, if the OL element was to be ignored, their LI children was also ignored, which is wrong.

File:

• FCKeditor/trunk/editor/_source/internals/fckdomtools.js (modified) (2 diffs)

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

@@ -245 +245 @@
         GetNextSourceElement : function( currentNode, ignoreSpaceTextOnly, stopSearchElements, ignoreElements )
         {
-                while( ( currentNode = this.GetNextSourceNode( currentNode, true ) ) )  // Only one "=".
+                while( ( currentNode = this.GetNextSourceNode( currentNode, false ) ) ) // Only one "=".
                 {
                         if ( currentNode.nodeType == 1 )
@@ -252 +252 @@
                                         break ;
 
-                                if ( !ignoreElements || !currentNode.nodeName.IEquals( ignoreElements ) )
-                                        return currentNode ;
+                                if ( ignoreElements && currentNode.nodeName.IEquals( ignoreElements ) )
+                                        return this.GetNextSourceElement( currentNode, ignoreSpaceTextOnly, stopSearchElements, ignoreElements ) ;
+                                
+                                return currentNode ;
                         }
                         else if ( ignoreSpaceTextOnly && currentNode.nodeType == 3 && currentNode.nodeValue.RTrim().length > 0 )