Changeset 825

Timestamp:

09/15/07 13:25:53 (6 years ago)

Author:

fredck

Message:

Fixed #525 : The union if successive DIVs will work properly now if EnterMode!=div. DIV elements are now considered the Block in element paths if no Block is available (previously it was set as the BlockLimit, leaving Block=null).

Location:

FCKeditor/trunk

Files:

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

FCKeditor/trunk/_whatsnew.html

@@ -217 +217 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/68">#68</a>] The style
                         system now properly handles Format styles when EnterMode=br.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/525">#525</a>] The union
+                        if successive DIVs will work properly now if EnterMode!=div.</li>
         </ul>
         <h3>

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

@@ -48 +48 @@
 
                                 if ( FCKListsLib.PathBlockLimitElements[ sElementName ] != null )
-                                        eBlockLimit = e ;
+                                {
+                                        // DIV is considered the Block, if no block is available (#525).
+                                        if ( !eBlock && sElementName == 'div' )
+                                                eBlock = e ;
+                                        else
+                                                eBlockLimit = e ;
+                                }
                         }
 

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

@@ -139 +139 @@
         var oRange = new FCKDomRange( this.Window ) ;
         oRange.MoveToSelection() ;
-
-        if ( !oRange.CheckIsCollapsed() )
+        
+        var isCollapsed = oRange.CheckIsCollapsed() ;
+
+        if ( !isCollapsed )
         {
                 // Bug #327, Backspace with an img selection would activate the default action in IE.
@@ -164 +166 @@
         if ( oRange.StartBlockLimit == oRange.EndBlockLimit && oStartBlock && oEndBlock )
         {
-                if ( !oRange.CheckIsCollapsed() )
+                if ( !isCollapsed )
                 {
                         var bEndOfBlock = oRange.CheckEndOfBlock() ;