Changeset 2185 for FCKeditor/branches

Timestamp:

2008-07-07 05:21:57 (5 months ago)

Author:

martinkou

Message:

Removed the new fckblockcontainercommand.js and restored the old fckblockquotecommand.js.
Moved Div creation logic of the Div dialog into the dialog HTML.

Location:

FCKeditor/branches/features/div_container

Files:

• editor/dialog/fck_div.html (modified) (3 diffs)
• editor/fckeditor.html (modified) (1 diff)
• editor/_source/commandclasses/fckblockcontainercommand.js (deleted)
• editor/_source/commandclasses/fckblockquotecommand.js (added)
• editor/_source/internals/fckcommands.js (modified) (1 diff)
• fckpackager.xml (modified) (2 diffs)

FCKeditor/branches/features/div_container/editor/dialog/fck_div.html

@@ -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 +142 @@
 }
 
+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 +274 @@
 
         if ( !ActiveEl )
-        {
-                var cmd = new FCKBlockContainerCommand( 'div', AlwaysCreate ) ;
-                cmd.Execute() ;
-                ActiveEl = cmd.createdBlock ;
-        }
+                ActiveEl = CreateDiv();
 
         var setValue = function( attrName, inputName )

FCKeditor/branches/features/div_container/editor/fckeditor.html

@@ -156 +156 @@
 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' ) ;

FCKeditor/branches/features/div_container/editor/_source/internals/fckcommands.js

@@ -94 +94 @@
                 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 ;

FCKeditor/branches/features/div_container/fckpackager.xml

@@ -131 +131 @@
                 <File path="editor/_source/commandclasses/fckjustifycommands.js" />
                 <File path="editor/_source/commandclasses/fckindentcommands.js" />
-                <File path="editor/_source/commandclasses/fckblockcontainercommand.js" />
+                <File path="editor/_source/commandclasses/fckblockquotecommand.js" />
                 <File path="editor/_source/commandclasses/fckcorestylecommand.js" />
                 <File path="editor/_source/commandclasses/fckremoveformatcommand.js" />
@@ -227 +227 @@
                 <File path="editor/_source/commandclasses/fckjustifycommands.js" />
                 <File path="editor/_source/commandclasses/fckindentcommands.js" />
-                <File path="editor/_source/commandclasses/fckblockcontainercommand.js" />
+                <File path="editor/_source/commandclasses/fckblockquotecommand.js" />
                 <File path="editor/_source/commandclasses/fckcorestylecommand.js" />
                 <File path="editor/_source/commandclasses/fckremoveformatcommand.js" />