+ This document contains various markup features commonly used by content editors
+ or "rédacteurs de contenu" as they are called in
+ France.
+ It is important that a WYSIWYG
+ tool has features that are easily available for the editor. If not, there is a risk
+ that content won't receive proper markup. Examples of commonly
+ found content are:
+
+ In the test we will try to recreate this document using the editor tools. To make
+ sure tables can be inserted properly we re-visit banana import statistics
+ from 1998.
+
+
+ This paragraph has and image at the very end of its contents.
+
+ This text has no block tag.
+ In the test we will try to recreate this document using the editor tools. To make
+ sure tables can be inserted properly we re-visit banana import statistics
+ from 1998.
+
+
+ The above is the FCKeditor logo loaded from the FCKeditor.net web site.
+
+
Index: /FCKeditor/trunk/editor/_source/classes/fckdomrange.js
===================================================================
--- /FCKeditor/trunk/editor/_source/classes/fckdomrange.js (revision 808)
+++ /FCKeditor/trunk/editor/_source/classes/fckdomrange.js (revision 809)
@@ -26,4 +26,5 @@
{
this.Window = sourceWindow ;
+ this._Cache = {} ;
}
@@ -61,5 +62,5 @@
while ( eEndNode && !eEndNode.previousSibling )
eEndNode = eEndNode.parentNode ;
-
+
eEndNode = eEndNode.previousSibling ;
}
@@ -72,4 +73,6 @@
this.EndBlockLimit = oElementPath.BlockLimit ;
}
+
+ this._Cache = {} ;
},
@@ -173,4 +176,9 @@
CheckStartOfBlock : function()
{
+ var bIsStartOfBlock = this._Cache.IsStartOfBlock ;
+
+ if ( bIsStartOfBlock != undefined )
+ return bIsStartOfBlock ;
+
// Create a clone of the current range.
var oTestRange = this.Clone() ;
@@ -182,13 +190,18 @@
oTestRange.SetStart( oTestRange.StartBlock || oTestRange.StartBlockLimit, 1 ) ;
- var bIsStartOfBlock = oTestRange.CheckIsEmpty() ;
+ bIsStartOfBlock = oTestRange.CheckIsEmpty() ;
oTestRange.Release() ;
- return bIsStartOfBlock ;
+ return ( this._Cache.IsStartOfBlock = bIsStartOfBlock ) ;
},
CheckEndOfBlock : function( refreshSelection )
{
+ var bIsEndOfBlock = this._Cache.IsEndOfBlock ;
+
+ if ( bIsEndOfBlock != undefined )
+ return bIsEndOfBlock ;
+
// Create a clone of the current range.
var oTestRange = this.Clone() ;
@@ -200,5 +213,5 @@
oTestRange.SetEnd( oTestRange.EndBlock || oTestRange.EndBlockLimit, 2 ) ;
- var bIsEndOfBlock = oTestRange.CheckIsCollapsed() ;
+ bIsEndOfBlock = oTestRange.CheckIsCollapsed() ;
if ( !bIsEndOfBlock )
@@ -232,5 +245,5 @@
this.Select() ;
- return bIsEndOfBlock ;
+ return this._Cache.IsEndOfBlock = bIsEndOfBlock ;
},
@@ -432,5 +445,5 @@
oRange.setStartAfter( targetElement ) ;
}
-
+
if ( !noInfoUpdate )
this._UpdateElementInfo() ;
@@ -530,5 +543,5 @@
case 'list_contents' :
var boundarySet = FCKListsLib.BlockBoundaries ;
- if ( unit == 'list_contents' )
+ if ( unit == 'list_contents' || FCKConfig.EnterMode == 'br' )
boundarySet = FCKListsLib.ListBoundaries ;
@@ -547,11 +560,11 @@
// We must look for the left boundary, relative to the range
// start, which is limited by a block element.
- while ( oNode
- && ( oNode.nodeType != 1
+ while ( oNode
+ && ( oNode.nodeType != 1
|| ( oNode != this.StartBlockLimit
&& !boundarySet[ oNode.nodeName.toLowerCase() ] ) ) )
{
this._Range.setStartBefore( oNode ) ;
-
+
if ( oNode == oNode.parentNode.firstChild && boundarySet[ oNode.parentNode.nodeName.toLowerCase() ] )
break ;
@@ -571,7 +584,7 @@
// We must look for the right boundary, relative to the range
// end, which is limited by a block element.
- while ( oNode
- && ( oNode.nodeType != 1
- || ( oNode != this.StartBlockLimit
+ while ( oNode
+ && ( oNode.nodeType != 1
+ || ( oNode != this.StartBlockLimit
&& !boundarySet[ oNode.nodeName.toLowerCase() ] ) ) )
{
@@ -583,8 +596,8 @@
oNode = FCKDomTools.GetNextSourceNode( oNode, true ) ;
}
-
+
// In EnterMode='br', the end , and | are returned. If "true", a
+ * dedicated block element block element will be created inside those
+ * elements to hold the selected content.
+ */
+ this.EnforceRealBlocks = false ;
+}
+
+FCKDomRangeInterator.CreateFromSelection = function( targetWindow )
+{
+ var range = new FCKDomRange( targetWindow ) ;
+ range.MoveToSelection() ;
+ return new FCKDomRangeInterator( range ) ;
+}
+
+FCKDomRangeInterator.prototype =
+{
+ /**
+ * Get the next paragraph element. It automatically breaks the document
+ * when necessary to generate block elements for the paragraphs.
+ */
+ GetNextParagraph : function()
+ {
+ var block ;
+ var range ;
+ var isLast ;
+
+ var boundarySet = this.ForceBrBreak ? FCKListsLib.ListBoundaries : FCKListsLib.BlockBoundaries ;
+
+ // This is the first interaction. Let's initialize it.
+ if ( !this._LastNode )
+ {
+ var range = this.Range.Clone() ;
+ range.Expand( this.ForceBrBreak ? 'list_contents' : 'block_contents' ) ;
+
+ this._NextNode = range.StartNode ;
+ this._LastNode = range.EndNode ;
+
+ // Let's reuse this variable.
+ range = null ;
+ }
+
+ var currentNode = this._NextNode ;
+ var lastNode = this._LastNode ;
+
+ while ( currentNode )
+ {
+ // closeRange indicates that a paragraph boundary has been found,
+ // so the range can be closed.
+ var closeRange = false ;
+
+ // includeNode indicates that the current node is good to be part
+ // of the range. By default, any non-element node is ok for it.
+ var includeNode = ( currentNode.nodeType != 1 ) ;
+
+ var continueFromSibling = false ;
+
+ // If it is an element node, let's check if it can be part of the
+ // range.
+ if ( !includeNode )
+ {
+ var nodeName = currentNode.nodeName.toLowerCase() ;
+
+ if ( boundarySet[ nodeName ] )
+ {
+ //
boundaries must be part of the range. It will
+ // happen only if ForceBrBreak.
+ if ( nodeName == 'br' )
+ includeNode = true ;
+ else if ( !range && currentNode.childNodes.length == 0 && nodeName != 'hr' )
+ {
+ // If we have found an empty block, and haven't started
+ // the range yet, it means we must return this block.
+ block = currentNode ;
+ break ;
+ }
+
+ closeRange = true ;
+ }
+ else
+ {
+ // If we have child nodes, let's check them.
+ if ( currentNode.firstChild )
+ {
+ // If we don't have a range yet, let's start it.
+ if ( !range )
+ {
+ range = new FCKDomRange( this.Range.Window ) ;
+ range.SetStart( currentNode, 3, true ) ;
+ }
+
+ currentNode = currentNode.firstChild ;
+ continue ;
+ }
+ includeNode = true ;
+ }
+ }
+ else if ( currentNode.nodeType == 3 )
+ {
+ // Ignore normal whitespaces (i.e. not including or
+ // other unicode whitespaces) before/after a block node.
+ if ( /^[\r\n\t ]+$/.test( currentNode.nodeValue ) )
+ includeNode = false ;
+ }
+
+ // The current node is good to be part of the range and we are
+ // starting a new range, initialize it first.
+ if ( includeNode && !range )
+ {
+ range = new FCKDomRange( this.Range.Window ) ;
+ range.SetStart( currentNode, 3, true ) ;
+ }
+
+ // The last node has been found.
+ isLast = ( currentNode == lastNode ) ;
+
+ // If we are in an element boundary, let's check if it is time
+ // to close the range, otherwise we include the parent within it.
+ if ( range && !closeRange )
+ {
+ var parentNode = currentNode.parentNode ;
+ while ( currentNode == parentNode.lastChild && !isLast )
+ {
+ if ( boundarySet[ parentNode.nodeName.toLowerCase() ] )
+ {
+ closeRange = true ;
+ break ;
+ }
+
+ currentNode = parentNode ;
+ continueFromSibling = true ;
+ }
+ }
+
+ // Now finally include the node.
+ if ( includeNode )
+ range.SetEnd( currentNode, 4, true ) ;
+
+ // We have found a block boundary. Let's close the range and move out of the
+ // loop.
+ if ( ( closeRange && range ) || isLast )
+ {
+ if ( range )
+ range._UpdateElementInfo() ;
+
+ break ;
+ }
+
+ currentNode = FCKDomTools.GetNextSourceNode( currentNode, continueFromSibling ) ;
+ }
+
+ // Now, based on the processed range, look for (or create) the block to be returned.
+ if ( !block )
+ {
+ // If no range has been found, this is the end.
+ if ( !range )
+ {
+ this._NextNode = null ;
+ return null ;
+ }
+
+ block = range.StartBlock ;
+
+ if ( !block
+ && !this.EnforceRealBlocks
+ && range.StartBlockLimit.nodeName.IEquals( 'DIV', 'TH', 'TD' )
+ && range.CheckStartOfBlock()
+ && range.CheckEndOfBlock() )
+ {
+ block = range.StartBlockLimit ;
+ }
+ else if ( !block || ( this.EnforceRealBlocks && block.nodeName.toLowerCase() == 'li' ) )
+ {
+ // Create the fixed block.
+ block = this.Range.Window.document.createElement( FCKConfig.EnterMode == 'p' ? 'p' : 'div' ) ;
+
+ // Move the contents of the temporary range to the fixed block.
+ range.ExtractContents().AppendTo( block ) ;
+ FCKDomTools.TrimNode( block ) ;
+
+ // Insert the fixed block into the DOM.
+ range.InsertNode( block ) ;
+
+ // When fixing a block, we can safely remove any remaining
+ // before of it.
+ var previousSibling = block.previousSibling ;
+ if ( previousSibling && previousSibling.nodeType == 1 && previousSibling.nodeName.toLowerCase() == 'br' )
+ previousSibling.parentNode.removeChild( previousSibling ) ;
+ }
+ else if ( block.nodeName.toLowerCase() != 'li' )
+ {
+ // If the range doesn't includes the entire contents of the
+ // block, we must split it, isolating the range in a dedicated
+ // block.
+ if ( !range.CheckStartOfBlock() || !range.CheckEndOfBlock() )
+ {
+ // The resulting block will be a clone of the current one.
+ block = block.cloneNode( false ) ;
+
+ // Extract the range contents, moving it to the new block.
+ range.ExtractContents().AppendTo( block ) ;
+ FCKDomTools.TrimNode( block ) ;
+
+ // Split the block. At this point, the range will be in the
+ // right position for our intents.
+ range.SplitBlock() ;
+
+ // Insert the new block into the DOM.
+ range.InsertNode( block ) ;
+ }
+ }
+ else if ( !isLast )
+ {
+ // LIs are returned as is, with all their children (due to the
+ // nested lists). But, the next node is the node right after
+ // the current range, which could be an child (nested
+ // lists) or the next sibling .
+
+ this._NextNode = FCKDomTools.GetNextSourceNode( range.EndNode, true ) ;
+ return block ;
+ }
+ }
+
+ // Get a reference for the next element. This is important because the
+ // above block can be removed or changed, so we can rely on it for the
+ // next interation.
+ this._NextNode = isLast ? null : FCKDomTools.GetNextSourceNode( block, true ) ;
+
+ return block ;
+ }
+} ;
Index: /FCKeditor/trunk/editor/_source/fckscriptloader.js
===================================================================
--- /FCKeditor/trunk/editor/_source/fckscriptloader.js (revision 808)
+++ /FCKeditor/trunk/editor/_source/fckscriptloader.js (revision 809)
@@ -98,4 +98,5 @@
FCKScriptLoader.AddScript( 'FCKDocumentFragment', 'classes/' , ['FCKDomTools'], FCK_SPECIFIC ) ;
FCKScriptLoader.AddScript( 'FCKDomRange' , 'classes/' , ['FCKBrowserInfo','FCKJSCoreExtensions','FCKW3CRange','FCKElementPath','FCKDomTools','FCKTools','FCKDocumentFragment'], FCK_GENERIC_SPECIFIC ) ;
+FCKScriptLoader.AddScript( 'FCKDomRangeInterator', 'classes/' , ['FCKDomRange','FCKListsLib'], FCK_GENERIC ) ;
FCKScriptLoader.AddScript( 'FCKElementPath' , 'classes/' , ['FCKListsLib'], FCK_GENERIC ) ;
FCKScriptLoader.AddScript( 'FCKEnterKey' , 'classes/' , ['FCKDomRange','FCKDomTools','FCKTools','FCKKeystrokeHandler','FCKListHandler'], FCK_GENERIC ) ;
Index: /FCKeditor/trunk/editor/_source/internals/fcklistslib.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fcklistslib.js (revision 808)
+++ /FCKeditor/trunk/editor/_source/internals/fcklistslib.js (revision 809)
@@ -57,5 +57,5 @@
// Elements used to separate block contents.
BlockBoundaries : { p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1 },
- ListBoundaries : { p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,br:1,body:1 },
+ ListBoundaries : { p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1,br:1 },
// Final setup of FCKListsLib once the editor is loaded (at FCK.StartEditor).
@@ -65,6 +65,6 @@
Setup : function()
{
- // is considered a block element only if EnterMode=div, otherwise it is a block limit.
- if ( FCKConfig.EnterMode == 'div' )
+ // is not considered a block element if EnterMode=p, it is a block limit in this case.
+ if ( FCKConfig.EnterMode != 'p' )
{
this.PathBlockElements.div = 1 ;
@@ -73,7 +73,4 @@
else
this.PathBlockLimitElements.div = 1 ;
-
- if ( FCKConfig.EnterMode == 'br' )
- this.BlockBoundaries.br = 1 ;
}
} ;
Index: /FCKeditor/trunk/editor/fckeditor.html
===================================================================
--- /FCKeditor/trunk/editor/fckeditor.html (revision 808)
+++ /FCKeditor/trunk/editor/fckeditor.html (revision 809)
@@ -96,4 +96,5 @@
LoadScript( '_source/classes/fckw3crange.js' ) ;
LoadScript( '_source/classes/fckdomrange_' + sSuffix + '.js' ) ;
+LoadScript( '_source/classes/fckdomrangeinterator.js' ) ;
LoadScript( '_source/classes/fckenterkey.js' ) ;
Index: /FCKeditor/trunk/fckpackager.xml
===================================================================
--- /FCKeditor/trunk/fckpackager.xml (revision 808)
+++ /FCKeditor/trunk/fckpackager.xml (revision 809)
@@ -104,4 +104,5 @@
+
@@ -196,4 +197,5 @@
+
|