Ticket #2531: fix_enterkey.patch

editor/_source/internals/fckdomtools.js

@@ -912 +912 @@
                 {
                         if ( child.nodeType == 1 )
                         {
+                                // ignore bogus BR's
+                                if ( child.nodeName.toLowerCase() == "br" && ( child.getAttribute( 'type' ) == '_moz' || child.getAttribute( '_moz_dirty' ) == "" ) )
+                                        child = child.nextSibling ; 
+                                        continue;
+                                
+                                if ( !elementCheckCallback || elementCheckCallback( child ) === true )
+                                        elementChild = child ;
+
                                 if ( elementChild || !FCKListsLib.InlineNonEmptyElements[ child.nodeName.toLowerCase() ] )
                                         return false ;
-
-                                if ( !elementCheckCallback || elementCheckCallback( child ) === true )
-                                        elementChild = child ;
                         }
                         else if ( child.nodeType == 3 && child.nodeValue.length > 0 )
                                 return false ;

editor/_source/classes/fckenterkey.js

@@ -530 +530 @@
                         oRange.MoveToElementEditStart( bIsStartOfBlock && !bIsEndOfBlock ? eNextBlock : eNewBlock ) ;
                 }
 
-                if ( FCKBrowserInfo.IsGeckoLike )
+                // Causes a problem when the following paragraph is huge, looks like the cursor jumped way down.
+                if ( FCKBrowserInfo.IsGeckoLike && FCKDomTools.CheckIsEmptyElement( eNextBlock || eNewBlock ) )
                         FCKDomTools.ScrollIntoView( eNextBlock || eNewBlock, false ) ;
 
                 oRange.Select() ;