Changeset 2209

Timestamp:

2008-07-11 13:37:09 (20 months ago)

Author:

martinkou

Message:

Fixed #2234 : Added the ability to create, modify and remove Div containers.

Location:

FCKeditor/trunk

Files:

• editor/dialog/fck_div.html (copied) (copied from FCKeditor/branches/features/div_container/editor/dialog/fck_div.html)
• editor/lang/en-au.js (modified) (1 diff)
• editor/lang/en-ca.js (modified) (1 diff)
• editor/lang/en.js (modified) (2 diffs)
• editor/lang/en-uk.js (modified) (1 diff)
• editor/lang/zh-cn.js (modified) (1 diff)
• editor/lang/zh.js (modified) (1 diff)
• editor/skins/default/fck_strip.gif (modified) (previous)
• editor/skins/office2003/fck_strip.gif (modified) (previous)
• editor/skins/silver/fck_strip.gif (modified) (previous)
• editor/_source/classes/fckdomrange.js (modified) (2 diffs)
• editor/_source/commandclasses/fckblockquotecommand.js (copied) (copied from FCKeditor/branches/features/div_container/editor/_source/commandclasses/fckblockquotecommand.js)
• editor/_source/commandclasses/fck_othercommands.js (modified) (1 diff)
• editor/_source/internals/fckcommands.js (modified) (1 diff)
• editor/_source/internals/fck_contextmenu.js (modified) (1 diff)
• editor/_source/internals/fckdomtools.js (modified) (2 diffs)
• editor/_source/internals/fckselection_gecko.js (modified) (1 diff)
• editor/_source/internals/fcktoolbaritems.js (modified) (1 diff)
• fckconfig.js (modified) (2 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/lang/en-au.js

@@ -74 +74 @@
 IncreaseIndent          : "Increase Indent",
 Blockquote                      : "Blockquote",
+CreateDiv                       : "Create Div Container",
+EditDiv                         : "Edit Div Container",
+DeleteDiv                       : "Remove Div Container",
 Undo                            : "Undo",
 Redo                            : "Redo",

FCKeditor/trunk/editor/lang/en-ca.js

@@ -74 +74 @@
 IncreaseIndent          : "Increase Indent",
 Blockquote                      : "Blockquote",
+CreateDiv                       : "Create Div Container",
+EditDiv                         : "Edit Div Container",
+DeleteDiv                       : "Remove Div Container",
 Undo                            : "Undo",
 Redo                            : "Redo",

FCKeditor/trunk/editor/lang/en.js

@@ -74 +74 @@
 IncreaseIndent          : "Increase Indent",
 Blockquote                      : "Blockquote",
+CreateDiv                       : "Create Div Container",
+EditDiv                         : "Edit Div Container",
+DeleteDiv                       : "Remove Div Container",
 Undo                            : "Undo",
 Redo                            : "Redo",
@@ -514 +517 @@
 DlgAboutLicenseTab      : "License",
 DlgAboutVersion         : "version",
-DlgAboutInfo            : "For further information go to"
+DlgAboutInfo            : "For further information go to",
+
+// Div Dialog
+DlgDivGeneralTab        : "General",
+DlgDivAdvancedTab       : "Advanced",
+DlgDivStyle             : "Style",
+DlgDivInlineStyle       : "Inline Style"
 };

FCKeditor/trunk/editor/lang/en-uk.js

@@ -74 +74 @@
 IncreaseIndent          : "Increase Indent",
 Blockquote                      : "Blockquote",
+CreateDiv                       : "Create Div Container",
+EditDiv                         : "Edit Div Container",
+DeleteDiv                       : "Remove Div Container",
 Undo                            : "Undo",
 Redo                            : "Redo",

FCKeditor/trunk/editor/lang/zh-cn.js

@@ -74 +74 @@
 IncreaseIndent          : "增加缩进量",
 Blockquote                      : "块引用",
+CreateDiv                       : "新增 Div 标籤",
+EditDiv                         : "更改 Div 标籤",
+DeleteDiv                       : "删除 Div 标籤",
 Undo                            : "撤消",
 Redo                            : "重做",

FCKeditor/trunk/editor/lang/zh.js

@@ -74 +74 @@
 IncreaseIndent          : "增加縮排",
 Blockquote                      : "引用文字",
+CreateDiv                       : "新增 Div 標籤",
+EditDiv                         : "變更 Div 標籤",
+DeleteDiv                       : "移除 Div 標籤",
 Undo                            : "復原",
 Redo                            : "重複",

FCKeditor/trunk/editor/_source/classes/fckdomrange.js

@@ -43 +43 @@
                         // For text nodes, the node itself is the StartNode.
                         var eStart      = innerRange.startContainer ;
-                        var eEnd        = innerRange.endContainer ;
 
                         var oElementPath = new FCKElementPath( eStart ) ;
@@ -51 +50 @@
                         this.StartBlockLimit    = oElementPath.BlockLimit ;
 
-                        if ( eStart != eEnd )
-                                oElementPath = new FCKElementPath( eEnd ) ;
-
-                        // The innerRange.endContainer[ innerRange.endOffset ] is not
-                        // usually part of the range, but the marker for the range end. So,
-                        // let's get the previous available node as the real end.
-                        var eEndNode = eEnd ;
-                        if ( innerRange.endOffset == 0 )
+                        if ( innerRange.collapsed )
                         {
-                                while ( eEndNode && !eEndNode.previousSibling )
-                                        eEndNode = eEndNode.parentNode ;
-
-                                if ( eEndNode )
-                                        eEndNode = eEndNode.previousSibling ;
+                                this.EndNode            = this.StartNode ;
+                                this.EndContainer       = this.StartContainer ;
+                                this.EndBlock           = this.StartBlock ;
+                                this.EndBlockLimit      = this.StartBlockLimit ;
                         }
-                        else if ( eEndNode.nodeType == 1 )
-                                eEndNode = eEndNode.childNodes[ innerRange.endOffset - 1 ] ;
-
-                        this.EndNode                    = eEndNode ;
-                        this.EndContainer               = eEnd ;
-                        this.EndBlock                   = oElementPath.Block ;
-                        this.EndBlockLimit              = oElementPath.BlockLimit ;
+                        else
+                        {
+                                var eEnd        = innerRange.endContainer ;
+
+                                if ( eStart != eEnd )
+                                        oElementPath = new FCKElementPath( eEnd ) ;
+
+                                // The innerRange.endContainer[ innerRange.endOffset ] is not
+                                // usually part of the range, but the marker for the range end. So,
+                                // let's get the previous available node as the real end.
+                                var eEndNode = eEnd ;
+                                if ( innerRange.endOffset == 0 )
+                                {
+                                        while ( eEndNode && !eEndNode.previousSibling )
+                                                eEndNode = eEndNode.parentNode ;
+
+                                        if ( eEndNode )
+                                                eEndNode = eEndNode.previousSibling ;
+                                }
+                                else if ( eEndNode.nodeType == 1 )
+                                        eEndNode = eEndNode.childNodes[ innerRange.endOffset - 1 ] ;
+
+                                this.EndNode                    = eEndNode ;
+                                this.EndContainer               = eEnd ;
+                                this.EndBlock                   = oElementPath.Block ;
+                                this.EndBlockLimit              = oElementPath.BlockLimit ;
+                        }
                 }
 

FCKeditor/trunk/editor/_source/commandclasses/fck_othercommands.js

@@ -576 +576 @@
         }
 };
+
+var FCKDeleteDivCommand = function()
+{
+}
+FCKDeleteDivCommand.prototype = 
+{
+        GetState : function()
+        {
+                if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+                        return FCK_TRISTATE_DISABLED ;
+
+                var node = FCKSelection.GetParentElement() ;
+                var path = new FCKElementPath( node ) ;
+                return path.BlockLimit && path.BlockLimit.nodeName.IEquals( 'div' ) ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
+        },
+
+        Execute : function()
+        {
+                // Create an undo snapshot before doing anything.
+                FCKUndo.SaveUndoStep() ;
+
+                // Find out the nodes to delete.
+                var nodes = FCKDomTools.GetSelectedDivContainers() ;
+                
+                // Remember the current selection position.
+                var range = new FCKDomRange( FCK.EditorWindow ) ;
+                range.MoveToSelection() ;
+                var bookmark = range.CreateBookmark() ;
+
+                // Delete the container DIV node.
+                for ( var i = 0 ; i < nodes.length ; i++)
+                        FCKDomTools.RemoveNode( nodes[i], true ) ;
+
+                // Restore selection.
+                range.MoveToBookmark( bookmark ) ;
+                range.Select() ;
+        }
+} ;

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

@@ -96 +96 @@
                 case 'Outdent'  : oCommand = new FCKIndentCommand( 'outdent', FCKConfig.IndentLength * -1 ) ; 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 ;
+                case 'DeleteDiv'        : oCommand = new FCKDeleteDivCommand() ; break ;
 
                 case 'TableInsertRowAfter'              : oCommand = new FCKTableCommand('TableInsertRowAfter') ; break ;

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

@@ -295 +295 @@
                                 }
                         }} ;
+
+                case 'DivContainer':
+                        return {
+                        AddItems : function( menu, tag, tagName )
+                        {
+                                var currentBlocks = FCKDomTools.GetSelectedDivContainers() ;
+
+                                if ( currentBlocks.length > 0 )
+                                {
+                                        menu.AddSeparator() ;
+                                        menu.AddItem( 'EditDiv', FCKLang.EditDiv, 75 ) ;
+                                        menu.AddItem( 'DeleteDiv', FCKLang.DeleteDiv, 76 ) ;
+                                }
+                        }} ;
+                        
                 // @Packager.Remove.Start
                 default :

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

@@ -697 +697 @@
         SetElementMarker : function ( markerObj, element, attrName, value)
         {
-                var id = String( parseInt( Math.random() * 0xfffffff, 10 ) ) ;
+                var id = String( parseInt( Math.random() * 0xffffffff, 10 ) ) ;
                 element._FCKMarkerId = id ;
                 element[attrName] = value ;
@@ -1021 +1021 @@
                 // In the DTD # == text node.
                 return ( childDTD['#'] && !FCKListsLib.NonEditableElements[ nodeName ] ) ;
+        },
+
+        GetSelectedDivContainers : function()
+        {
+                var currentBlocks = [] ;
+                var range = new FCKDomRange( FCK.EditorWindow ) ;
+                range.MoveToSelection() ;
+
+                var startNode = range.GetTouchedStartNode() ;
+                var endNode = range.GetTouchedEndNode() ;
+                var currentNode = startNode ;
+
+                if ( startNode == endNode )
+                {
+                        while ( endNode.nodeType == 1 && endNode.lastChild )
+                                endNode = endNode.lastChild ;
+                        endNode = FCKDomTools.GetNextSourceNode( endNode ) ;
+                }
+
+                while ( currentNode && currentNode != endNode )
+                {
+                        if ( currentNode.nodeType != 3 || !/^[ \t\n]*$/.test( currentNode.nodeValue ) )
+                        {
+                                var path = new FCKElementPath( currentNode ) ;
+                                var blockLimit = path.BlockLimit ;
+                                if ( blockLimit && blockLimit.nodeName.IEquals( 'div' ) && currentBlocks.IndexOf( blockLimit ) == -1 )
+                                        currentBlocks.push( blockLimit ) ;
+                        }
+
+                        currentNode = FCKDomTools.GetNextSourceNode( currentNode ) ;
+                }
+
+                return currentBlocks ;
         }
 } ;

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

@@ -76 +76 @@
                 if ( oSel )
                 {
-                        // make the common case fast - for collapsed/nearly collapsed selections just return anchor.parent.
+                        // if anchorNode == focusNode, see if the selection is text only or including nodes.
+                        // if text only, return the parent node.
+                        // if the selection includes DOM nodes, then the anchorNode is the nearest container.
                         if ( oSel.anchorNode && oSel.anchorNode == oSel.focusNode )
-                                return oSel.anchorNode.parentNode ;
+                        {
+                                var oRange = oSel.getRangeAt( 0 ) ;
+                                if ( oRange.collapsed || oRange.startContainer.nodeType == 3 )
+                                        return oSel.anchorNode.parentNode ;
+                                else
+                                        return oSel.anchorNode ;
+                        }
 
                         // looks like we're having a large selection here. To make the behavior same as IE's TextRange.parentElement(),

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

@@ -72 +72 @@
                 case 'Indent'                   : oItem = new FCKToolbarButton( 'Indent'        , FCKLang.IncreaseIndent, null, null, false, true, 29 ) ; break ;
                 case 'Blockquote'                       : oItem = new FCKToolbarButton( 'Blockquote'    , FCKLang.Blockquote, null, null, false, true, 73 ) ; break ;
+                case 'CreateDiv'                        : oItem = new FCKToolbarButton( 'CreateDiv'     , FCKLang.CreateDiv, null, null, false, true, 74 ) ; break ;
 
                 case 'Link'                             : oItem = new FCKToolbarButton( 'Link'          , FCKLang.InsertLinkLbl, FCKLang.InsertLink, null, false, true, 34 ) ; break ;

FCKeditor/trunk/fckconfig.js

@@ -106 +106 @@
         '/',
         ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
-        ['OrderedList','UnorderedList','-','Outdent','Indent','Blockquote'],
+        ['OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'],
         ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
         ['Link','Unlink','Anchor'],
@@ -146 +146 @@
 ] ;
 
-FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','Table','Form'] ;
+FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','Table','Form','DivContainer'] ;
 FCKConfig.BrowserContextMenuOnCtrl = false ;
 

FCKeditor/trunk/_whatsnew.html

@@ -43 +43 @@
                         from the Link dialog are now encoded by default to prevent being harvested by spammers.
                         (Kudos to asuter for proposing the patch) </li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2234">#2234</a>] Added the
+                        ability to create, modify and remove Div containers.</li>
         </ul>
         <p>