Changeset 5880

Timestamp:

09/14/10 16:16:29 (3 years ago)

Author:

Saare

Message:

#6075: [FF] Newly created links didn't fill in information on edit.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/link/plugin.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -82 +82 @@
                 <li><a href="http://dev.ckeditor.com/ticket/5218">#5218</a> : [FF] Copy/paste of an image from same domain changed URL to relative URL.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/6265">#6265</a> : Popup window properties were visible in the link dialog's target tab when nothing was selected.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/6075">#6075</a> : [FF] Newly created links didn't fill in information on edit.</li>
                 <li>Updated the following language files:<ul>
                         <li><a href="http://dev.ckeditor.com/ticket/6246">#6246</a> : Chinese Simplified;</li>

CKEditor/trunk/_source/plugins/link/plugin.js

@@ -177 +177 @@
         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();