Ticket #4117: 4117_4.patch

_source/plugins/selection/plugin.js

@@ -783 +783 @@
                 {
                         if ( this.isLocked )
                         {
-                                var range = new CKEDITOR.dom.range();
+                                var range = new CKEDITOR.dom.range( this.document );
                                 range.setStartBefore( element );
                                 range.setEndAfter( element );
 

CHANGES.html

@@ -197 +197 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3622">#3622</a> : The toolbar in the v2 
                         skin was wrapping improperly in some languages.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4119">#4119</a> : Unable to edit image link with image dialog.</li> 
+                <li><a href="http://dev.fckeditor.net/ticket/4117">#4117</a> : Fixed dialog error when transforming image into button.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>

_source/plugins/image/dialogs/image.js

@@ -264 +264 @@
                                 // Edit existing Image.
                                 if ( this.imageEditMode )
                                 {
-                                        var imgTagName = this.imageEditMode,
-                                                removeObj = this.imageElement;
+                                        var imgTagName = this.imageEditMode;
 
                                         // Image dialog and Input element.
                                         if ( dialogType == 'image' && imgTagName == 'input' && confirm( editor.lang.image.button2Img ) )
@@ -274 +273 @@
                                                 imgTagName = 'img';
                                                 this.imageElement = editor.document.createElement( 'img' );
                                                 this.imageElement.setAttribute( 'alt', '' );
-                                                removeObj.insertBeforeMe( this.imageElement );
-                                                removeObj.remove( false );
-
+                                                editor.insertElement( this.imageElement );
                                         }
                                         // ImageButton dialog and Image element.
                                         else if ( dialogType != 'image' && imgTagName == 'img' && confirm( editor.lang.image.img2Button ))
@@ -290 +287 @@
                                                                 alt : ''
                                                         }
                                                 );
-                                                removeObj.insertBeforeMe( this.imageElement );
-                                                removeObj.remove( false );
+                                                editor.insertElement( this.imageElement );
                                         }
                                 }
                                 else    // Create a new image.
@@ -323 +319 @@
                                                 //Insert a new Link.
                                                 if ( !this.linkEditMode )
                                                 {
-                                                        this.linkElement.append( this.imageElement, false );
-                                                        editor.insertElement( this.linkElement );
+                                                        editor.insertElement(this.linkElement);
+                                                        this.linkElement.append(this.imageElement, false);
                                                 }
-                                                else    //Link already exists, image not.
-                                                        this.linkElement.append( this.imageElement, false );
+                                                else     //Link already exists, image not.
+                                                        editor.insertElement(this.imageElement );
                                         }
                                         else
                                                 editor.insertElement( this.imageElement );
@@ -337 +333 @@
                                         //Add a new link element.
                                         if ( !this.linkEditMode && this.addLink )
                                         {
-                                                this.imageElement.insertBeforeMe( this.linkElement );
+                                                editor.insertElement( this.linkElement );
                                                 this.imageElement.appendTo( this.linkElement );
                                         }
                                         //Remove Link, Image exists.
                                         else if ( this.linkEditMode && !this.addLink )
-                                                this.linkElement.remove( true );
-                                }
+                                        {
+                                                editor.getSelection().selectElement( this.linkElement );
+                                                console.log( 'select link element' );
+                                                editor.insertElement( this.imageElement );
+                                        }
+                                }
                         },
                         onLoad : function()
                         {