Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html (revision 5879)
+++ /CKEditor/trunk/CHANGES.html (revision 5880)
@@ -82,4 +82,5 @@
#5218 : [FF] Copy/paste of an image from same domain changed URL to relative URL.
#6265 : Popup window properties were visible in the link dialog's target tab when nothing was selected.
+ #6075 : [FF] Newly created links didn't fill in information on edit.
Updated the following language files:
- #6246 : Chinese Simplified;
Index: /CKEditor/trunk/_source/plugins/link/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/link/plugin.js (revision 5879)
+++ /CKEditor/trunk/_source/plugins/link/plugin.js (revision 5880)
@@ -177,8 +177,15 @@
getSelectedLink : function( editor )
{
- var range;
try
{
- range = editor.getSelection().getRanges( true )[ 0 ];
+ var selection = editor.getSelection();
+ if ( selection.getType() == CKEDITOR.SELECTION_ELEMENT )
+ {
+ var selectedElement = selection.getSelectedElement();
+ if ( selectedElement.is( 'a' ) )
+ return selectedElement;
+ }
+
+ var range = selection.getRanges( true )[ 0 ];
range.shrink( CKEDITOR.SHRINK_TEXT );
var root = range.getCommonAncestor();