Changeset 637

Timestamp:

2007-08-08 11:11:57 (16 months ago)

Author:

martinkou

Message:

Fixed #328 : Added logic for inserting a bogus <$EnterMode> tag towards the end in WYSIWYG mode, such that the user can escape from a formatted block at the end of the document.

Location:

FCKeditor/trunk/editor/_source/internals

Files:

• fckdomtools.js (modified) (1 diff)
• fck.js (modified) (2 diffs)
• fckxhtml.js (modified) (2 diffs)

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

@@ -292 +292 @@
 
                 return -1 ;
+        },
+
+        PaddingNodeTag : ( new Date() ).getTime() + "_documentPadding",
+
+        EnforcePaddingNode : function( doc, tagName )
+        {
+                this.CheckAndRemovePaddingNode( doc, tagName, true ) ;
+                if ( ! doc.body.lastChild 
+                                || doc.body.lastChild.nodeType != 1 
+                                || doc.body.lastChild.tagName.toLowerCase() == tagName.toLowerCase() )
+                        return ;
+                var node = doc.createElement( tagName ) ;
+                if ( FCKBrowserInfo.IsGecko && FCKListsLib.NonEmptyBlockElements[ tagName ] )
+                        FCKTools.AppendBogusBr( node ) ;
+                node.id = this.PaddingNodeTag ;
+                doc.body.appendChild( node ) ;
+        },
+
+        CheckAndRemovePaddingNode : function( doc, tagName, dontRemove )
+        {
+                var paddingNode = doc.getElementById( this.PaddingNodeTag ) ;
+                if ( ! paddingNode )
+                        return ;
+
+                // If the padding node is changed, remove its status as a padding node.
+                if ( paddingNode.parentNode != doc.body
+                        || paddingNode.tagName.toLowerCase() != tagName
+                        || ( paddingNode.childNodes.length > 1 ) 
+                        || ( paddingNode.firstChild && paddingNode.firstChild.nodeValue != '\xa0' 
+                                && String(paddingNode.firstChild.tagName).toLowerCase() != 'br' ) )
+                {
+                        paddingNode.removeAttribute( 'id' ) ;
+                        return ;
+                }
+
+                // Now we're sure the padding node exists, and it is unchanged, remove it.
+                if ( !dontRemove )
+                paddingNode.parentNode.removeChild( paddingNode ) ;
         }
 } ;

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

@@ -772 +772 @@
 }
 
+function _FCK_PaddingNodeListener()
+{
+        FCKDomTools.EnforcePaddingNode( FCK.EditorDocument, FCKConfig.EnterMode ) ;
+}
+
 function _FCK_EditingArea_OnLoad()
 {
@@ -779 +784 @@
 
         FCK.InitializeBehaviors() ;
+        FCK.AttachToOnSelectionChange( _FCK_PaddingNodeListener ) ;
         
         // Listen for mousedown and mouseup events for tracking drag and drops.

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

@@ -28 +28 @@
 FCKXHtml.GetXHTML = function( node, includeNode, format )
 {
+        FCKDomTools.CheckAndRemovePaddingNode( node.ownerDocument, FCKConfig.EnterMode ) ;
         FCKXHtmlEntities.Initialize() ;
 
@@ -97 +98 @@
                 FCK.ResetIsDirty() ;
 
+        FCKDomTools.EnforcePaddingNode( node.ownerDocument, FCKConfig.EnterMode ) ;
         return sXHTML ;
 }