Index: Keditor/branches/features/div_container/editor/_source/commandclasses/fckblockcontainercommand.js
===================================================================
--- /FCKeditor/branches/features/div_container/editor/_source/commandclasses/fckblockcontainercommand.js (revision 2184)
+++ (revision )
@@ -1,259 +1,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- * - GNU General Public License Version 2 or later (the "GPL")
- * http://www.gnu.org/licenses/gpl.html
- *
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- * http://www.gnu.org/licenses/lgpl.html
- *
- * - Mozilla Public License Version 1.1 or later (the "MPL")
- * http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * FCKBlockContainerCommand Class: adds or removes container tags for
- * block nodes.
- */
-
-var FCKBlockContainerCommand = function( tagName, alwaysCreate )
-{
- this.tagName = tagName ;
- this.alwaysCreate = !!alwaysCreate ;
- this.createdBlock = null ;
-}
-
-FCKBlockContainerCommand.prototype =
-{
- Execute : function()
- {
- FCKUndo.SaveUndoStep() ;
-
- var state = this.GetState() ;
-
- var range = new FCKDomRange( FCK.EditorWindow ) ;
- range.MoveToSelection() ;
-
- var bookmark = range.CreateBookmark() ;
-
- // Kludge for #1592: if the bookmark nodes are in the beginning of
- // $tagNamee, then move them to the nearest block element in the
- // $tagNamee.
- if ( FCKBrowserInfo.IsIE )
- {
- var bStart = range.GetBookmarkNode( bookmark, true ) ;
- var bEnd = range.GetBookmarkNode( bookmark, false ) ;
-
- var cursor ;
-
- if ( bStart
- && bStart.parentNode.nodeName.IEquals( this.tagName )
- && !bStart.previousSibling )
- {
- cursor = bStart ;
- while ( ( cursor = cursor.nextSibling ) )
- {
- if ( FCKListsLib.BlockElements[ cursor.nodeName.toLowerCase() ] )
- FCKDomTools.MoveNode( bStart, cursor, true ) ;
- }
- }
-
- if ( bEnd
- && bEnd.parentNode.nodeName.IEquals( this.tagName )
- && !bEnd.previousSibling )
- {
- cursor = bEnd ;
- while ( ( cursor = cursor.nextSibling ) )
- {
- if ( FCKListsLib.BlockElements[ cursor.nodeName.toLowerCase() ] )
- {
- if ( cursor.firstChild == bStart )
- FCKDomTools.InsertAfterNode( bStart, bEnd ) ;
- else
- FCKDomTools.MoveNode( bEnd, cursor, true ) ;
- }
- }
- }
- }
-
- var iterator = new FCKDomRangeIterator( range ) ;
- var block ;
-
- if ( state == FCK_TRISTATE_OFF )
- {
- iterator.EnforceRealBlocks = true ;
- var paragraphs = [] ;
- while ( ( block = iterator.GetNextParagraph() ) )
- paragraphs.push( block ) ;
-
- // If no paragraphs, create one from the current selection position.
- if ( paragraphs.length < 1 )
- {
- para = range.Window.document.createElement( FCKConfig.EnterMode.IEquals( 'p' ) ? 'p' : 'div' ) ;
- range.InsertNode( para ) ;
- para.appendChild( range.Window.document.createTextNode( '\ufeff' ) ) ;
- range.MoveToBookmark( bookmark ) ;
- range.MoveToNodeContents( para ) ;
- range.Collapse( true ) ;
- bookmark = range.CreateBookmark() ;
- paragraphs.push( para ) ;
- }
-
- // Make sure all paragraphs have the same parent.
- var commonParent = paragraphs[0].parentNode ;
- var tmp = [] ;
- for ( var i = 0 ; i < paragraphs.length ; i++ )
- {
- block = paragraphs[i] ;
- commonParent = FCKDomTools.GetCommonParents( block.parentNode, commonParent ).pop() ;
- }
- var lastBlock = null ;
- while ( paragraphs.length > 0 )
- {
- block = paragraphs.shift() ;
- while ( block.parentNode != commonParent )
- block = block.parentNode ;
- if ( block != lastBlock )
- tmp.push( block ) ;
- lastBlock = block ;
- }
-
- // If any of the selected blocks is a $tagNamee, remove it to prevent nested $tagNamees.
- while ( tmp.length > 0 )
- {
- block = tmp.shift() ;
- if ( block.nodeName.IEquals( this.tagName ) )
- {
- var docFrag = FCKTools.GetElementDocument( block ).createDocumentFragment() ;
- while ( block.firstChild )
- {
- docFrag.appendChild( block.removeChild( block.firstChild ) ) ;
- paragraphs.push( docFrag.lastChild ) ;
- }
- block.parentNode.replaceChild( docFrag, block ) ;
- }
- else
- paragraphs.push( block ) ;
- }
-
- // Now we have all the blocks to be included in a new $tagNamee node.
- var bqBlock = this.createdBlock = range.Window.document.createElement( this.tagName ) ;
- commonParent.insertBefore( bqBlock, paragraphs[0] ) ;
- while ( paragraphs.length > 0 )
- {
- block = paragraphs.shift() ;
- bqBlock.appendChild( block ) ;
- }
- }
- else if ( state == FCK_TRISTATE_ON )
- {
- var moveOutNodes = [] ;
- while ( ( block = iterator.GetNextParagraph() ) )
- {
- var bqParent = null ;
- var bqChild = null ;
- while ( block.parentNode )
- {
- if ( block.parentNode.nodeName.IEquals( this.tagName ) )
- {
- bqParent = block.parentNode ;
- bqChild = block ;
- break ;
- }
- block = block.parentNode ;
- }
-
- if ( bqParent && bqChild )
- moveOutNodes.push( bqChild ) ;
- }
-
- var movedNodes = [] ;
- while ( moveOutNodes.length > 0 )
- {
- var node = moveOutNodes.shift() ;
- var bqBlock = node.parentNode ;
-
- // If the node is located at the beginning or the end, just take it out without splitting.
- // Otherwise, split the $tagNamee node and move the paragraph in between the two $tagNamee nodes.
- if ( node == node.parentNode.firstChild )
- {
- bqBlock.parentNode.insertBefore( bqBlock.removeChild( node ), bqBlock ) ;
- if ( ! bqBlock.firstChild )
- bqBlock.parentNode.removeChild( bqBlock ) ;
- }
- else if ( node == node.parentNode.lastChild )
- {
- bqBlock.parentNode.insertBefore( bqBlock.removeChild( node ), bqBlock.nextSibling ) ;
- if ( ! bqBlock.firstChild )
- bqBlock.parentNode.removeChild( bqBlock ) ;
- }
- else
- FCKDomTools.BreakParent( node, node.parentNode, range ) ;
-
- movedNodes.push( node ) ;
- }
-
- if ( FCKConfig.EnterMode.IEquals( 'br' ) )
- {
- while ( movedNodes.length )
- {
- var node = movedNodes.shift() ;
- var firstTime = true ;
- if ( node.nodeName.IEquals( 'div' ) )
- {
- var docFrag = FCKTools.GetElementDocument( node ).createDocumentFragment() ;
- var needBeginBr = firstTime && node.previousSibling &&
- !FCKListsLib.BlockBoundaries[node.previousSibling.nodeName.toLowerCase()] ;
- if ( firstTime && needBeginBr )
- docFrag.appendChild( FCKTools.GetElementDocument( node ).createElement( 'br' ) ) ;
- var needEndBr = node.nextSibling &&
- !FCKListsLib.BlockBoundaries[node.nextSibling.nodeName.toLowerCase()] ;
- while ( node.firstChild )
- docFrag.appendChild( node.removeChild( node.firstChild ) ) ;
- if ( needEndBr )
- docFrag.appendChild( FCKTools.GetElementDocument( node ).createElement( 'br' ) ) ;
- node.parentNode.replaceChild( docFrag, node ) ;
- firstTime = false ;
- }
- }
- }
-
- this.createdBlock = null ;
- }
- range.MoveToBookmark( bookmark ) ;
- range.Select() ;
-
- FCK.Focus() ;
- FCK.Events.FireEvent( 'OnSelectionChange' ) ;
- },
-
- GetState : function()
- {
- // Disabled if not WYSIWYG.
- if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || ! FCK.EditorWindow )
- return FCK_TRISTATE_DISABLED ;
-
- if ( this.alwaysCreate )
- return FCK_TRISTATE_OFF ;
-
- var path = new FCKElementPath( FCKSelection.GetBoundaryParentElement( true ) ) ;
- var firstBlock = path.Block || path.BlockLimit ;
-
- if ( !firstBlock || firstBlock.nodeName.toLowerCase() == 'body' )
- return FCK_TRISTATE_OFF ;
-
- // See if the first block has a $tagName parent.
- for ( var i = 0 ; i < path.Elements.length ; i++ )
- {
- if ( path.Elements[i].nodeName.IEquals( this.tagName ) )
- return FCK_TRISTATE_ON ;
- }
- return FCK_TRISTATE_OFF ;
- }
-} ;
Index: /FCKeditor/branches/features/div_container/editor/_source/commandclasses/fckblockquotecommand.js
===================================================================
--- /FCKeditor/branches/features/div_container/editor/_source/commandclasses/fckblockquotecommand.js (revision 2185)
+++ /FCKeditor/branches/features/div_container/editor/_source/commandclasses/fckblockquotecommand.js (revision 2185)
@@ -0,0 +1,250 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKBlockQuoteCommand Class: adds or removes blockquote tags.
+ */
+
+var FCKBlockQuoteCommand = function()
+{
+}
+
+FCKBlockQuoteCommand.prototype =
+{
+ Execute : function()
+ {
+ FCKUndo.SaveUndoStep() ;
+
+ var state = this.GetState() ;
+
+ var range = new FCKDomRange( FCK.EditorWindow ) ;
+ range.MoveToSelection() ;
+
+ var bookmark = range.CreateBookmark() ;
+
+ // Kludge for #1592: if the bookmark nodes are in the beginning of
+ // blockquote, then move them to the nearest block element in the
+ // blockquote.
+ if ( FCKBrowserInfo.IsIE )
+ {
+ var bStart = range.GetBookmarkNode( bookmark, true ) ;
+ var bEnd = range.GetBookmarkNode( bookmark, false ) ;
+
+ var cursor ;
+
+ if ( bStart
+ && bStart.parentNode.nodeName.IEquals( 'blockquote' )
+ && !bStart.previousSibling )
+ {
+ cursor = bStart ;
+ while ( ( cursor = cursor.nextSibling ) )
+ {
+ if ( FCKListsLib.BlockElements[ cursor.nodeName.toLowerCase() ] )
+ FCKDomTools.MoveNode( bStart, cursor, true ) ;
+ }
+ }
+
+ if ( bEnd
+ && bEnd.parentNode.nodeName.IEquals( 'blockquote' )
+ && !bEnd.previousSibling )
+ {
+ cursor = bEnd ;
+ while ( ( cursor = cursor.nextSibling ) )
+ {
+ if ( FCKListsLib.BlockElements[ cursor.nodeName.toLowerCase() ] )
+ {
+ if ( cursor.firstChild == bStart )
+ FCKDomTools.InsertAfterNode( bStart, bEnd ) ;
+ else
+ FCKDomTools.MoveNode( bEnd, cursor, true ) ;
+ }
+ }
+ }
+ }
+
+ var iterator = new FCKDomRangeIterator( range ) ;
+ var block ;
+
+ if ( state == FCK_TRISTATE_OFF )
+ {
+ iterator.EnforceRealBlocks = true ;
+ var paragraphs = [] ;
+ while ( ( block = iterator.GetNextParagraph() ) )
+ paragraphs.push( block ) ;
+
+ // If no paragraphs, create one from the current selection position.
+ if ( paragraphs.length < 1 )
+ {
+ para = range.Window.document.createElement( FCKConfig.EnterMode.IEquals( 'p' ) ? 'p' : 'div' ) ;
+ range.InsertNode( para ) ;
+ para.appendChild( range.Window.document.createTextNode( '\ufeff' ) ) ;
+ range.MoveToBookmark( bookmark ) ;
+ range.MoveToNodeContents( para ) ;
+ range.Collapse( true ) ;
+ bookmark = range.CreateBookmark() ;
+ paragraphs.push( para ) ;
+ }
+
+ // Make sure all paragraphs have the same parent.
+ var commonParent = paragraphs[0].parentNode ;
+ var tmp = [] ;
+ for ( var i = 0 ; i < paragraphs.length ; i++ )
+ {
+ block = paragraphs[i] ;
+ commonParent = FCKDomTools.GetCommonParents( block.parentNode, commonParent ).pop() ;
+ }
+ var lastBlock = null ;
+ while ( paragraphs.length > 0 )
+ {
+ block = paragraphs.shift() ;
+ while ( block.parentNode != commonParent )
+ block = block.parentNode ;
+ if ( block != lastBlock )
+ tmp.push( block ) ;
+ lastBlock = block ;
+ }
+
+ // If any of the selected blocks is a blockquote, remove it to prevent nested blockquotes.
+ while ( tmp.length > 0 )
+ {
+ block = tmp.shift() ;
+ if ( block.nodeName.IEquals( 'blockquote' ) )
+ {
+ var docFrag = FCKTools.GetElementDocument( block ).createDocumentFragment() ;
+ while ( block.firstChild )
+ {
+ docFrag.appendChild( block.removeChild( block.firstChild ) ) ;
+ paragraphs.push( docFrag.lastChild ) ;
+ }
+ block.parentNode.replaceChild( docFrag, block ) ;
+ }
+ else
+ paragraphs.push( block ) ;
+ }
+
+ // Now we have all the blocks to be included in a new blockquote node.
+ var bqBlock = range.Window.document.createElement( 'blockquote' ) ;
+ commonParent.insertBefore( bqBlock, paragraphs[0] ) ;
+ while ( paragraphs.length > 0 )
+ {
+ block = paragraphs.shift() ;
+ bqBlock.appendChild( block ) ;
+ }
+ }
+ else if ( state == FCK_TRISTATE_ON )
+ {
+ var moveOutNodes = [] ;
+ while ( ( block = iterator.GetNextParagraph() ) )
+ {
+ var bqParent = null ;
+ var bqChild = null ;
+ while ( block.parentNode )
+ {
+ if ( block.parentNode.nodeName.IEquals( 'blockquote' ) )
+ {
+ bqParent = block.parentNode ;
+ bqChild = block ;
+ break ;
+ }
+ block = block.parentNode ;
+ }
+
+ if ( bqParent && bqChild )
+ moveOutNodes.push( bqChild ) ;
+ }
+
+ var movedNodes = [] ;
+ while ( moveOutNodes.length > 0 )
+ {
+ var node = moveOutNodes.shift() ;
+ var bqBlock = node.parentNode ;
+
+ // If the node is located at the beginning or the end, just take it out without splitting.
+ // Otherwise, split the blockquote node and move the paragraph in between the two blockquote nodes.
+ if ( node == node.parentNode.firstChild )
+ {
+ bqBlock.parentNode.insertBefore( bqBlock.removeChild( node ), bqBlock ) ;
+ if ( ! bqBlock.firstChild )
+ bqBlock.parentNode.removeChild( bqBlock ) ;
+ }
+ else if ( node == node.parentNode.lastChild )
+ {
+ bqBlock.parentNode.insertBefore( bqBlock.removeChild( node ), bqBlock.nextSibling ) ;
+ if ( ! bqBlock.firstChild )
+ bqBlock.parentNode.removeChild( bqBlock ) ;
+ }
+ else
+ FCKDomTools.BreakParent( node, node.parentNode, range ) ;
+
+ movedNodes.push( node ) ;
+ }
+
+ if ( FCKConfig.EnterMode.IEquals( 'br' ) )
+ {
+ while ( movedNodes.length )
+ {
+ var node = movedNodes.shift() ;
+ var firstTime = true ;
+ if ( node.nodeName.IEquals( 'div' ) )
+ {
+ var docFrag = FCKTools.GetElementDocument( node ).createDocumentFragment() ;
+ var needBeginBr = firstTime && node.previousSibling &&
+ !FCKListsLib.BlockBoundaries[node.previousSibling.nodeName.toLowerCase()] ;
+ if ( firstTime && needBeginBr )
+ docFrag.appendChild( FCKTools.GetElementDocument( node ).createElement( 'br' ) ) ;
+ var needEndBr = node.nextSibling &&
+ !FCKListsLib.BlockBoundaries[node.nextSibling.nodeName.toLowerCase()] ;
+ while ( node.firstChild )
+ docFrag.appendChild( node.removeChild( node.firstChild ) ) ;
+ if ( needEndBr )
+ docFrag.appendChild( FCKTools.GetElementDocument( node ).createElement( 'br' ) ) ;
+ node.parentNode.replaceChild( docFrag, node ) ;
+ firstTime = false ;
+ }
+ }
+ }
+ }
+ range.MoveToBookmark( bookmark ) ;
+ range.Select() ;
+
+ FCK.Focus() ;
+ FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+ },
+
+ GetState : function()
+ {
+ // Disabled if not WYSIWYG.
+ if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || ! FCK.EditorWindow )
+ return FCK_TRISTATE_DISABLED ;
+
+ var path = new FCKElementPath( FCKSelection.GetBoundaryParentElement( true ) ) ;
+ var firstBlock = path.Block || path.BlockLimit ;
+
+ if ( !firstBlock || firstBlock.nodeName.toLowerCase() == 'body' )
+ return FCK_TRISTATE_OFF ;
+
+ // See if the first block has a blockquote parent.
+ for ( var i = 0 ; i < path.Elements.length ; i++ )
+ {
+ if ( path.Elements[i].nodeName.IEquals( 'blockquote' ) )
+ return FCK_TRISTATE_ON ;
+ }
+ return FCK_TRISTATE_OFF ;
+ }
+} ;
Index: /FCKeditor/branches/features/div_container/editor/_source/internals/fckcommands.js
===================================================================
--- /FCKeditor/branches/features/div_container/editor/_source/internals/fckcommands.js (revision 2184)
+++ /FCKeditor/branches/features/div_container/editor/_source/internals/fckcommands.js (revision 2185)
@@ -94,5 +94,5 @@
case 'Indent' : oCommand = new FCKIndentCommand( 'indent', FCKConfig.IndentLength ) ; break ;
case 'Outdent' : oCommand = new FCKIndentCommand( 'outdent', FCKConfig.IndentLength * -1 ) ; break ;
- case 'Blockquote' : oCommand = new FCKBlockContainerCommand( 'blockquote' ) ; break ;
+ case 'Blockquote' : oCommand = new FCKBlockQuoteCommand() ; break ;
case 'CreateDiv' : oCommand = new FCKDialogCommand( 'CreateDiv', FCKLang.CreateDiv, 'dialog/fck_div.html', 380, 210, null, null, true ) ; break ;
case 'EditDiv' : oCommand = new FCKDialogCommand( 'EditDiv', FCKLang.EditDiv, 'dialog/fck_div.html', 380, 210, null, null, false ) ; break ;
Index: /FCKeditor/branches/features/div_container/editor/dialog/fck_div.html
===================================================================
--- /FCKeditor/branches/features/div_container/editor/dialog/fck_div.html (revision 2184)
+++ /FCKeditor/branches/features/div_container/editor/dialog/fck_div.html (revision 2185)
@@ -31,10 +31,31 @@
var dialog = window.parent ;
var oEditor = dialog.InnerDialogLoaded() ;
+var FCK = oEditor.FCK ;
var FCKLang = oEditor.FCKLang ;
var FCKBrowserInfo = oEditor.FCKBrowserInfo ;
var FCKStyles = oEditor.FCKStyles ;
var FCKElementPath = oEditor.FCKElementPath ;
-var FCKBlockContainerCommand = oEditor.FCKBlockContainerCommand ;
+var FCKDomRange = oEditor.FCKDomRange ;
+var FCKDomTools = oEditor.FCKDomTools ;
+var FCKDomRangeIterator = oEditor.FCKDomRangeIterator ;
var AlwaysCreate = dialog.Args().CustomValue ;
+
+String.prototype.IEquals = function()
+{
+ var thisUpper = this.toUpperCase() ;
+
+ var aArgs = arguments ;
+
+ // The arguments could also be a single array.
+ if ( aArgs.length == 1 && aArgs[0].pop )
+ aArgs = aArgs[0] ;
+
+ for ( var i = 0 ; i < aArgs.length ; i++ )
+ {
+ if ( thisUpper == aArgs[i].toUpperCase() )
+ return true ;
+ }
+ return false ;
+}
var ActiveEl = null ;
@@ -121,4 +142,131 @@
}
+function CreateDiv()
+{
+ var bqBlock ;
+ var range = new FCKDomRange( FCK.EditorWindow ) ;
+ range.MoveToSelection() ;
+
+ var bookmark = range.CreateBookmark() ;
+
+ // Kludge for #1592: if the bookmark nodes are in the beginning of
+ // $tagName, then move them to the nearest block element in the
+ // $tagName.
+ if ( FCKBrowserInfo.IsIE )
+ {
+ var bStart = range.GetBookmarkNode( bookmark, true ) ;
+ var bEnd = range.GetBookmarkNode( bookmark, false ) ;
+
+ var cursor ;
+
+ if ( bStart
+ && bStart.parentNode.nodeName.IEquals( 'div' )
+ && !bStart.previousSibling )
+ {
+ cursor = bStart ;
+ while ( ( cursor = cursor.nextSibling ) )
+ {
+ if ( FCKListsLib.BlockElements[ cursor.nodeName.toLowerCase() ] )
+ FCKDomTools.MoveNode( bStart, cursor, true ) ;
+ }
+ }
+
+ if ( bEnd
+ && bEnd.parentNode.nodeName.IEquals( 'div' )
+ && !bEnd.previousSibling )
+ {
+ cursor = bEnd ;
+ while ( ( cursor = cursor.nextSibling ) )
+ {
+ if ( FCKListsLib.BlockElements[ cursor.nodeName.toLowerCase() ] )
+ {
+ if ( cursor.firstChild == bStart )
+ FCKDomTools.InsertAfterNode( bStart, bEnd ) ;
+ else
+ FCKDomTools.MoveNode( bEnd, cursor, true ) ;
+ }
+ }
+ }
+ }
+
+ var iterator = new FCKDomRangeIterator( range ) ;
+ var block ;
+
+ if ( true )
+ {
+ iterator.EnforceRealBlocks = true ;
+ var paragraphs = [] ;
+ while ( ( block = iterator.GetNextParagraph() ) )
+ paragraphs.push( block ) ;
+
+ // If no paragraphs, create one from the current selection position.
+ if ( paragraphs.length < 1 )
+ {
+ para = range.Window.document.createElement( FCKConfig.EnterMode.IEquals( 'p' ) ? 'p' : 'div' ) ;
+ range.InsertNode( para ) ;
+ para.appendChild( range.Window.document.createTextNode( '\ufeff' ) ) ;
+ range.MoveToBookmark( bookmark ) ;
+ range.MoveToNodeContents( para ) ;
+ range.Collapse( true ) ;
+ bookmark = range.CreateBookmark() ;
+ paragraphs.push( para ) ;
+ }
+
+ // Make sure all paragraphs have the same parent.
+ var commonParent = paragraphs[0].parentNode ;
+ var tmp = [] ;
+ for ( var i = 0 ; i < paragraphs.length ; i++ )
+ {
+ block = paragraphs[i] ;
+ commonParent = FCKDomTools.GetCommonParents( block.parentNode, commonParent ).pop() ;
+ }
+ var lastBlock = null ;
+ while ( paragraphs.length > 0 )
+ {
+ block = paragraphs.shift() ;
+ while ( block.parentNode != commonParent )
+ block = block.parentNode ;
+ if ( block != lastBlock )
+ tmp.push( block ) ;
+ lastBlock = block ;
+ }
+
+ // If any of the selected blocks is a $tagName, remove it to prevent nested $tagNames.
+ while ( tmp.length > 0 )
+ {
+ block = tmp.shift() ;
+ if ( block.nodeName.IEquals( 'div' ) )
+ {
+ var docFrag = FCKTools.GetElementDocument( block ).createDocumentFragment() ;
+ while ( block.firstChild )
+ {
+ docFrag.appendChild( block.removeChild( block.firstChild ) ) ;
+ paragraphs.push( docFrag.lastChild ) ;
+ }
+ block.parentNode.replaceChild( docFrag, block ) ;
+ }
+ else
+ paragraphs.push( block ) ;
+ }
+
+ // Now we have all the blocks to be included in a new $tagName node.
+ bqBlock = range.Window.document.createElement( 'div' ) ;
+ commonParent.insertBefore( bqBlock, paragraphs[0] ) ;
+ while ( paragraphs.length > 0 )
+ {
+ block = paragraphs.shift() ;
+ bqBlock.appendChild( block ) ;
+ }
+ }
+
+ range.MoveToBookmark( bookmark ) ;
+ range.Select() ;
+
+ FCK.Focus() ;
+ FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+
+ return bqBlock ;
+}
+
function Ok()
{
@@ -126,9 +274,5 @@
if ( !ActiveEl )
- {
- var cmd = new FCKBlockContainerCommand( 'div', AlwaysCreate ) ;
- cmd.Execute() ;
- ActiveEl = cmd.createdBlock ;
- }
+ ActiveEl = CreateDiv();
var setValue = function( attrName, inputName )
Index: /FCKeditor/branches/features/div_container/editor/fckeditor.html
===================================================================
--- /FCKeditor/branches/features/div_container/editor/fckeditor.html (revision 2184)
+++ /FCKeditor/branches/features/div_container/editor/fckeditor.html (revision 2185)
@@ -156,5 +156,5 @@
LoadScript( '_source/commandclasses/fckjustifycommands.js' ) ;
LoadScript( '_source/commandclasses/fckindentcommands.js' ) ;
-LoadScript( '_source/commandclasses/fckblockcontainercommand.js' ) ;
+LoadScript( '_source/commandclasses/fckblockquotecommand.js' ) ;
LoadScript( '_source/commandclasses/fckcorestylecommand.js' ) ;
LoadScript( '_source/commandclasses/fckremoveformatcommand.js' ) ;
Index: /FCKeditor/branches/features/div_container/fckpackager.xml
===================================================================
--- /FCKeditor/branches/features/div_container/fckpackager.xml (revision 2184)
+++ /FCKeditor/branches/features/div_container/fckpackager.xml (revision 2185)
@@ -131,5 +131,5 @@
-
+
@@ -227,5 +227,5 @@
-
+