Changeset 2103

Timestamp:

2008-06-23 09:46:09 (7 months ago)

Author:

martinkou

Message:

Added context menu item for editing div containers.

Location:

FCKeditor/branches/features/div_container

Files:

• editor/dialog/fck_div.html (modified) (3 diffs)
• editor/lang/en.js (modified) (1 diff)
• editor/_source/internals/fckcommands.js (modified) (1 diff)
• editor/_source/internals/fck_contextmenu.js (modified) (1 diff)
• fckconfig.js (modified) (1 diff)

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

@@ -102 +102 @@
 function Ok()
 {
-        dialog.Selection.EnsureSelection() ;
+        oEditor.FCKUndo.SaveUndoStep() ;
 
         if ( !ActiveEl )
@@ -130 +130 @@
         setValue( 'dir', 'selLangDir' ) ;
 
+        var styleName = GetE( 'selStyle' ).value ;
+        var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
+        range.SetStart( ActiveEl, 3 ) ;
+        range.SetEnd( ActiveEl, 4 ) ;
+        if ( styleName )
+                FCKStyles.GetStyle( styleName ).ApplyToRange( range, false, true ) ;
+
         return true ;
 }
@@ -147 +154 @@
                                         <span fcklang="DlgDivStyle">Style</span><br />
                                         <select id="selStyle" style="width: 100%;">
+                                                <option value="">&nbsp;
                                         </select>
                                 </td>

FCKeditor/branches/features/div_container/editor/lang/en.js

@@ -73 +73 @@
 IncreaseIndent          : "Increase Indent",
 Blockquote                      : "Blockquote",
-Div                             : "Div",
+CreateDiv                       : "Create DIV Container",
+EditDiv                         : "Edit DIV Container",
 Undo                            : "Undo",
 Redo                            : "Redo",

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

@@ -95 +95 @@
                 case 'Outdent'  : oCommand = new FCKIndentCommand( 'outdent', FCKConfig.IndentLength * -1 ) ; break ;
                 case 'Blockquote'       : oCommand = new FCKBlockContainerCommand( 'blockquote' ) ; break ;
-                case 'CreateDiv'        : oCommand = new FCKDialogCommand( 'CreateDiv', FCKLang.Div, 'dialog/fck_div.html', 380, 210, null, null, true ) ; break ;
-                case 'EditDiv'          : oCommand = new FCKDialogCommand( 'EditDiv', FCKLang.Div, 'dialog/fck_div.html', 380, 210, null, null, false ) ; 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 'TableInsertRowAfter'              : oCommand = new FCKTableCommand('TableInsertRowAfter') ; break ;

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

@@ -293 +293 @@
                                 }
                         }} ;
+
+                case 'DivContainer':
+                        return {
+                        AddItems : function( menu, tag, tagName )
+                        {
+                                var path = new FCKElementPath( FCKSelection.GetParentElement() ) ;
+                                if ( path.BlockLimit && path.BlockLimit.nodeName.IEquals( 'div' ) )
+                                {
+                                        menu.AddSeparator() ;
+                                        menu.AddItem( 'EditDiv', FCKLang.EditDiv, 73 ) ;
+                                }
+                        }} ;
+                        
                 // @Packager.Remove.Start
                 default :

FCKeditor/branches/features/div_container/fckconfig.js

@@ -143 +143 @@
 ] ;
 
-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 ;