Ticket #4119: 4119.patch

CHANGES.html

@@ -192 +192 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4003">#4003</a> : Markup on the image dialog was disrupted when removing the border input.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4096">#4096</a> : Editor content area was pushed down in IE RTL quirks.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4112">#4112</a> : [FF] Paste dialog had scrollbars in quirks.</li> 
+                <li><a href="http://dev.fckeditor.net/ticket/4119">#4119</a> : Unable to edit image link with image dialog.</li> 
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>

_source/plugins/image/dialogs/image.js

@@ -209 +209 @@
                                 this.preview = CKEDITOR.document.getById( 'previewImage' );
 
                                 var editor = this.getParentEditor(),
-                                        element = this.getParentEditor().getSelection().getSelectedElement();
+                                        sel = this.getParentEditor().getSelection(),
+                                        element = sel.getSelectedElement(),
+                                        link = element && element.getAscendant( 'a' );
 
                                 // Copy of the image
                                 this.originalElement = editor.document.createElement( 'img' );
                                 this.originalElement.setAttribute( 'alt', '' );
                                 this.originalElement.setCustomData( 'isReady', 'false' );
 
-                                if ( element && element.getName() == 'a' )
+                                if ( link )
                                 {
-                                        this.linkElement = element;
+                                        this.linkElement = link;
                                         this.linkEditMode = true;
 
                                         // Look for Image element.
-                                        var linkChildren = element.getChildren();
+                                        var linkChildren = link.getChildren();
                                         if ( linkChildren.count() == 1 )                        // 1 child.
                                         {
                                                 var childTagName = linkChildren.getItem( 0 ).getName();
@@ -237 +239 @@
                                         }
                                         // Fill out all fields.
                                         if ( dialogType == 'image' )
-                                                this.setupContent( LINK, element );
+                                                this.setupContent( LINK, link );
                                 }
-                                else if ( element && element.getName() == 'img' && !element.getAttribute( '_cke_protected_html' ) )
+
+                                if ( element && element.getName() == 'img' && !element.getAttribute( '_cke_protected_html' ) )
                                         this.imageEditMode = 'img';
                                 else if ( element && element.getName() == 'input' && element.getAttribute( 'type' ) && element.getAttribute( 'type' ) == 'image' )
                                         this.imageEditMode = 'input';