Changeset 598

Timestamp:

2007-07-31 09:24:09 (16 months ago)

Author:

martinkou

Message:

Fix for #393 : Fixed the issue where the caret would still jump to the next line when the user moves it to the end of the line in some cases.
Fix for #393 : Fixed the issue where tag discontinuation by the <End> key would only discontinue the innermost inline tag.

Location:

FCKeditor/trunk/editor/_source/internals

Files:

• fck_gecko.js (modified) (5 diffs)
• fcktools.js (modified) (1 diff)

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

@@ -70 +70 @@
                 if ( keyCode < 33 || keyCode > 40 )
                         return ;
+                
+                var blockEmptyStop = function( node )
+                {
+                        if ( node.nodeType != 1 )
+                                return false ;
+                        var tag = node.tagName.toLowerCase() ;
+                        return ( FCKListsLib.BlockElements[tag] || FCKListsLib.EmptyElements[tag] ) ;
+                }
 
                 var moveCursor = function()
@@ -79 +87 @@
 
                         var node = range.endContainer ;
-                        
+
                         // only perform the patched behavior if we're at the end of a text node.
                         if ( node.nodeType != 3 )
@@ -96 +104 @@
                         //      - if the DFS has scanned all nodes under my parent, then go the next step.
                         //      - if there is a text node after me but still under my parent, then do nothing and return.
-                        var nextTextNode = FCKTools.GetNextTextNode( node, node.parentNode ) ;
+                        var nextTextNode = FCKTools.GetNextTextNode( node, node.parentNode, blockEmptyStop ) ;
                         if ( nextTextNode )
                                 return ;
@@ -103 +111 @@
                         range = FCK.EditorDocument.createRange() ;
 
-                        nextTextNode = FCKTools.GetNextTextNode( node, node.parentNode.parentNode ) ;
+                        nextTextNode = FCKTools.GetNextTextNode( node, node.parentNode.parentNode, blockEmptyStop ) ;
                         if ( nextTextNode )
                         {
@@ -115 +123 @@
                         {
                                 // no suitable next siblings under our grandparent! what to do next?
-                                node = node.parentNode ;
+                                while ( node.parentNode 
+                                        && node == node.parentNode.lastChild 
+                                        && ( ! FCKListsLib.BlockElements[node.parentNode.tagName.toLowerCase()] ) )
+                                        node = node.parentNode ;
+                        
+
                                 if ( FCKListsLib.BlockElements[ parentTag ] 
                                                 || FCKListsLib.EmptyElements[ parentTag ]

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

@@ -535 +535 @@
 }
 
-FCKTools.GetNextTextNode = function( textnode, limitNode )
+FCKTools.GetNextTextNode = function( textnode, limitNode, checkStop )
 {
         node = this.GetNextNode( textnode, limitNode ) ;
+        if ( checkStop && node && checkStop( node ) )
+                return null ;
         while ( node && node.nodeType != 3 )
+        {
                 node = this.GetNextNode( node, limitNode ) ;
+                if ( checkStop && node && checkStop( node ) )
+                        return null ;
+        }
         return node ;
 }