Changeset 643

Timestamp:

2007-08-09 09:43:14 (16 months ago)

Author:

martinkou

Message:

Fixed #357 : Added "Delete Anchor" option in anchor context menu.

Location:

FCKeditor/trunk/editor

Files:

• lang/en-au.js (modified) (1 diff)
• lang/en-ca.js (modified) (1 diff)
• lang/en.js (modified) (1 diff)
• lang/en-uk.js (modified) (1 diff)
• lang/zh-cn.js (modified) (1 diff)
• lang/zh.js (modified) (1 diff)
• _source/commandclasses/fck_othercommands.js (modified) (1 diff)
• _source/internals/fckcommands.js (modified) (1 diff)
• _source/internals/fck_contextmenu.js (modified) (1 diff)

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

@@ -46 +46 @@
 RemoveLink                      : "Remove Link",
 Anchor                          : "Insert/Edit Anchor",
+AnchorDelete                    : "Delete Anchor",
 InsertImageLbl          : "Image",
 InsertImage                     : "Insert/Edit Image",

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

@@ -46 +46 @@
 RemoveLink                      : "Remove Link",
 Anchor                          : "Insert/Edit Anchor",
+AnchorDelete                    : "Delete Anchor",
 InsertImageLbl          : "Image",
 InsertImage                     : "Insert/Edit Image",

FCKeditor/trunk/editor/lang/en.js

@@ -46 +46 @@
 RemoveLink                      : "Remove Link",
 Anchor                          : "Insert/Edit Anchor",
+AnchorDelete                    : "Delete Anchor",
 InsertImageLbl          : "Image",
 InsertImage                     : "Insert/Edit Image",

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

@@ -46 +46 @@
 RemoveLink                      : "Remove Link",
 Anchor                          : "Insert/Edit Anchor",
+AnchorDelete                    : "Delete Anchor",
 InsertImageLbl          : "Image",
 InsertImage                     : "Insert/Edit Image",

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

@@ -46 +46 @@
 RemoveLink                      : "取消超链接",
 Anchor                          : "插入/编辑锚点链接",
+AnchorDelete                    : "清除锚点链接",
 InsertImageLbl          : "图象",
 InsertImage                     : "插入/编辑图象",

FCKeditor/trunk/editor/lang/zh.js

@@ -46 +46 @@
 RemoveLink                      : "移除超連結",
 Anchor                          : "插入/編輯錨點",
+AnchorDelete                    : "移除錨點",
 InsertImageLbl          : "影像",
 InsertImage                     : "插入/編輯影像",

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

@@ -432 +432 @@
         }
 };
+
+var FCKAnchorDeleteCommand = function()
+{
+        this.Name = 'AnchorDelete' ;
+}
+
+FCKAnchorDeleteCommand.prototype = 
+{
+        Execute : function()
+        {
+                if (FCK.Selection.GetType() == 'Control')
+                {
+                        FCK.Selection.Delete();
+                }
+                else
+                {
+                        var oFakeImage = FCK.Selection.GetSelectedElement() ;
+                        if ( oFakeImage )
+                        {
+                                if ( oFakeImage.tagName == 'IMG' && oFakeImage.getAttribute('_fckanchor') )
+                                        oAnchor = FCK.GetRealElement( oFakeImage ) ;
+                                else
+                                        oFakeImage = null ;
+                        }
+
+                        //Search for a real anchor
+                        if ( !oFakeImage )
+                        {
+                                oAnchor = FCK.Selection.MoveToAncestorNode( 'A' ) ;
+                                if ( oAnchor )
+                                        FCK.Selection.SelectNode( oAnchor ) ;
+                        }
+
+                        // If it's also a link, then just remove the name and exit
+                        if ( oAnchor.href.length != 0 )
+                        {
+                                oAnchor.removeAttribute( 'name' ) ;
+                                // Remove temporary class for IE
+                                if ( FCKBrowserInfo.IsIE )
+                                        oAnchor.className = oAnchor.className.replace( FCKRegexLib.FCK_Class, '' ) ;
+                                return ;
+                        }
+
+                        // We need to remove the anchor
+                        // If we got a fake image, then just remove it and we're done
+                        if ( oFakeImage )
+                        {
+                                oFakeImage.parentNode.removeChild( oFakeImage ) ;
+                                return ;
+                        }
+                        // Empty anchor, so just remove it
+                        if ( oAnchor.innerHTML.length == 0 )
+                        {
+                                oAnchor.parentNode.removeChild( oAnchor ) ;
+                                return ;
+                        }
+                        // Anchor with content, leave the content
+                        FCKTools.RemoveOuterTags( oAnchor ) ;
+                }
+                if ( FCKBrowserInfo.IsGecko )
+                        FCK.Selection.Collapse( true ) ;
+        },
+
+        GetState : function()
+        {
+                return FCK.GetNamedCommandState( 'Unlink') ;
+        }
+};

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

@@ -44 +44 @@
                 case 'Unlink'           : oCommand = new FCKUnlinkCommand() ; break ;
                 case 'Anchor'           : oCommand = new FCKDialogCommand( 'Anchor'             , FCKLang.DlgAnchorTitle                , 'dialog/fck_anchor.html'              , 370, 170 ) ; break ;
+                case 'AnchorDelete'     : oCommand = new FCKAnchorDeleteCommand() ; break ;
                 case 'BulletedList'     : oCommand = new FCKDialogCommand( 'BulletedList', FCKLang.BulletedListProp             , 'dialog/fck_listprop.html?UL' , 370, 170 ) ; break ;
                 case 'NumberedList'     : oCommand = new FCKDialogCommand( 'NumberedList', FCKLang.NumberedListProp             , 'dialog/fck_listprop.html?OL' , 370, 170 ) ; break ;

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

@@ -145 +145 @@
                                         menu.AddSeparator() ;
                                         menu.AddItem( 'Anchor', FCKLang.AnchorProp, 36 ) ;
+                                        menu.AddItem( 'AnchorDelete', FCKLang.AnchorDelete ) ;
                                 }
                         }} ;