Index: /FCKeditor/trunk/editor/_source/classes/fckstyle.js
===================================================================
--- /FCKeditor/trunk/editor/_source/classes/fckstyle.js (revision 2219)
+++ /FCKeditor/trunk/editor/_source/classes/fckstyle.js (revision 2220)
@@ -788,5 +788,5 @@
if ( !isTag )
{
- value = value.replace( /\n/g, '
' ) ;
+ value = value.replace( /\n/g, '
' ) ;
value = value.replace( /[ \t]{2,}/g,
function ( match )
@@ -809,11 +809,15 @@
var innerHTML = block.innerHTML.Trim() ;
- // 1. Delete ANSI whitespaces immediately before and after
because they are not visible.
- // 2. Mark down any
nodes here so they can be turned into \n in the next step and avoid being compressed.
- innerHTML = innerHTML.replace( /[ \t\r\n]*(
' ) ;
-
- // 3. Compress other ANSI whitespaces since they're only visible as one single space previously.
+ // 1. Delete ANSI whitespaces immediately before and after
because
+ // they are not visible.
+ // 2. Mark down any
nodes here so they can be turned into \n in
+ // the next step and avoid being compressed.
+ innerHTML = innerHTML.replace( /[ \t\r\n]*(
' ) ;
+
+ // 3. Compress other ANSI whitespaces since they're only visible as one
+ // single space previously.
// 4. Convert to spaces since is no longer needed in .
- // 5. Convert any
to \n. This must not be done earlier because the \n would then get compressed.
+ // 5. Convert any
to \n. This must not be done earlier because
+ // the \n would then get compressed.
var htmlIterator = new FCKHtmlIterator( innerHTML ) ;
var results = [] ;
@@ -822,12 +826,14 @@
if ( !isTag )
value = value.replace( /([ \t\n\r]+| )/g, ' ' ) ;
- else if ( isTag && value == '
' )
+ else if ( isTag && value == '
' )
value = '\n' ;
results.push( value ) ;
} ) ;
- // Assigning innerHTML to in IE causes all linebreaks to be reduced to spaces.
- // Assigning outerHTML to
in IE doesn't work if the
isn't contained in another node
- // since the node reference is changed after outerHTML assignment.
+ // Assigning innerHTML to
in IE causes all linebreaks to be
+ // reduced to spaces.
+ // Assigning outerHTML to
in IE doesn't work if the
isn't
+ // contained in another node since the node reference is changed after
+ // outerHTML assignment.
// So, we need some hacks to workaround IE bugs here.
if ( FCKBrowserInfo.IsIE )
@@ -835,10 +841,90 @@
var temp = doc.createElement( 'div' ) ;
temp.appendChild( newBlock ) ;
- newBlock.outerHTML = '
\n' + results.join( '' ) + '
' ;
+ newBlock.outerHTML = '\n' + results.join( '' ) + '
' ;
newBlock = temp.removeChild( temp.firstChild ) ;
}
else
newBlock.innerHTML = results.join( '' ) ;
+
return newBlock ;
+ },
+
+ /**
+ * Merge a block with a previous
block, if available.
+ */
+ _CheckAndMergePre : function( previousBlock, preBlock )
+ {
+ // Check if the previous block and the current block are next
+ // to each other.
+ if ( previousBlock != FCKDomTools.GetPreviousSourceElement( preBlock, true ) )
+ return ;
+
+ // Merge the previous block contents into the current
+ // block.
+ //
+ // Another thing to be careful here is that currentBlock might contain
+ // a '\n' at the beginning, and previousBlock might contain a '\n'
+ // towards the end. These new lines are not normally displayed but they
+ // become visible after merging.
+ var innerHTML = previousBlock.innerHTML.replace( /\n$/, '' ) + '\n\n' +
+ preBlock.innerHTML.replace( /^\n/, '' ) ;
+
+ // Buggy IE normalizes innerHTML from
, breaking whitespaces.
+ if ( FCKBrowserInfo.IsIE )
+ preBlock.outerHTML = '
' + innerHTML + '
' ;
+ else
+ preBlock.innerHTML = innerHTML ;
+
+ // Remove the previous block.
+ //
+ // The preBlock must not be moved or deleted from the DOM tree. This
+ // guarantees the FCKDomRangeIterator in _ApplyBlockStyle would not
+ // get lost at the next iteration.
+ FCKDomTools.RemoveNode( previousBlock ) ;
+ },
+
+ _CheckAndSplitPre : function( newBlock )
+ {
+ var lastNewBlock ;
+
+ var cursor = newBlock.firstChild ;
+
+ // We are not splitting
at the beginning of the block, so
+ // we'll start from the second child.
+ cursor = cursor && cursor.nextSibling ;
+
+ while ( cursor )
+ {
+ var next = cursor.nextSibling ;
+
+ // If we have two
s, and they're not at the beginning or the end,
+ // then we'll split up the contents following them into another block.
+ // Stop processing if we are at the last child couple.
+ if ( next && next.nextSibling && cursor.nodeName.IEquals( 'br' ) && next.nodeName.IEquals( 'br' ) )
+ {
+ // Remove the first
.
+ FCKDomTools.RemoveNode( cursor ) ;
+
+ // Move to the node after the second
.
+ cursor = next.nextSibling ;
+
+ // Remove the second
.
+ FCKDomTools.RemoveNode( next ) ;
+
+ // Create the block that will hold the child nodes from now on.
+ lastNewBlock = FCKDomTools.InsertAfterNode( lastNewBlock || newBlock, FCKDomTools.CloneElement( newBlock ) ) ;
+
+ continue ;
+ }
+
+ // If we split it, then start moving the nodes to the new block.
+ if ( lastNewBlock )
+ {
+ cursor = cursor.previousSibling ;
+ FCKDomTools.MoveNode(cursor.nextSibling, lastNewBlock ) ;
+ }
+
+ cursor = cursor.nextSibling ;
+ }
},
@@ -863,7 +949,5 @@
var block ;
var doc = range.Window.document ;
-
- var preBlocks = [] ;
- var convertedPreBlocks = [] ;
+ var previousPreBlock ;
while( ( block = iterator.GetNextParagraph() ) ) // Only one =
@@ -872,17 +956,16 @@
var newBlock = this.BuildElement( doc ) ;
+ // Check if we are changing from/to .
+ var newBlockIsPre = newBlock.nodeName.IEquals( 'pre' ) ;
+ var blockIsPre = block.nodeName.IEquals( 'pre' ) ;
+
+ var toPre = newBlockIsPre && !blockIsPre ;
+ var fromPre = !newBlockIsPre && blockIsPre ;
+
// Move everything from the current node to the new one.
- var newBlockIsPre = newBlock.nodeName.IEquals( 'pre' ) ;
- var blockIsPre = block.nodeName.IEquals( 'pre' ) ;
- if ( newBlockIsPre && !blockIsPre )
- {
+ if ( toPre )
newBlock = this._ToPre( doc, block, newBlock ) ;
- preBlocks.push( newBlock ) ;
- }
- else if ( !newBlockIsPre && blockIsPre )
- {
+ else if ( fromPre )
newBlock = this._FromPre( doc, block, newBlock ) ;
- convertedPreBlocks.push( newBlock ) ;
- }
else // Convering from a regular block to another regular block.
FCKDomTools.MoveChildren( block, newBlock ) ;
@@ -891,46 +974,14 @@
block.parentNode.insertBefore( newBlock, block ) ;
FCKDomTools.RemoveNode( block ) ;
- }
-
- // Merge adjacent blocks for #1229.
- for ( var i = 0 ; i < preBlocks.length - 1 ; i++ )
- {
- // Check if the next block in HTML equals the next block generated.
- if ( FCKDomTools.GetNextSourceElement( preBlocks[i], true, [], [], true ) != preBlocks[i+1] )
- continue ;
-
- // Merge the upper
block's content into the lower
block.
- // Remove the upper
block.
- preBlocks[i+1].innerHTML = preBlocks[i].innerHTML + '\n\n' + preBlocks[i+1].innerHTML ;
- FCKDomTools.RemoveNode( preBlocks[i] ) ;
- }
-
- // Split converted
blocks for #1229.
- for ( var i = 0 ; i < convertedPreBlocks.length ; i++ )
- {
- var currentBlock = convertedPreBlocks[i] ;
- var lastNewBlock = null ;
- for ( var j = 0 ; j < currentBlock.childNodes.length ; j++ )
- {
- var cursor = currentBlock.childNodes[j] ;
-
- // If we have two
s, and they're not at the beginning or the end,
- // then we'll split up the contents following them into another block.
- if ( cursor.nodeName.IEquals( 'br' ) && j != 0 && j != currentBlock.childNodes.length - 2
- && cursor.nextSibling && cursor.nextSibling.nodeName.IEquals( 'br' ) )
- {
- FCKDomTools.RemoveNode( cursor.nextSibling ) ;
- FCKDomTools.RemoveNode( cursor ) ;
- j-- ; // restart at current index at next iteration
- lastNewBlock = FCKDomTools.InsertAfterNode( lastNewBlock || currentBlock, doc.createElement( currentBlock.nodeName ) ) ;
- continue ;
- }
-
- if ( lastNewBlock )
- {
- FCKDomTools.MoveNode( cursor, lastNewBlock ) ;
- j-- ; // restart at current index at next iteration
- }
- }
+
+ // Complete other tasks after inserting the node in the DOM.
+ if ( newBlockIsPre )
+ {
+ if ( previousPreBlock )
+ this._CheckAndMergePre( previousPreBlock, newBlock ) ; // Merge successive blocks.
+ previousPreBlock = newBlock ;
+ }
+ else if ( fromPre )
+ this._CheckAndSplitPre( newBlock ) ; // Split
in successive s.
}