Ticket #4117: 4117.patch

CHANGES.html

@@ -187 +187 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4097">#4097</a> : No undo/redo support for fontColor and backgroundColor buttons.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4111">#4111</a> : Fixed apply block style after inline style applied on full document error.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3622">#3622</a> : Fixed shift enter with selection not deleting highlighted text.</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

@@ -261 +261 @@
                                 // 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 ) )
@@ -271 +270 @@
                                                 imgTagName = 'img';
                                                 this.imageElement = editor.document.createElement( 'img' );
                                                 this.imageElement.setAttribute( 'alt', '' );
-                                                removeObj.insertBeforeMe( this.imageElement );
-                                                removeObj.remove( false );
 
                                         }
                                         // ImageButton dialog and Image element.
@@ -287 +284 @@
                                                                 alt : ''
                                                         }
                                                 );
-                                                removeObj.insertBeforeMe( this.imageElement );
-                                                removeObj.remove( false );
                                         }
+                                        editor.insertElement( this.imageElement );
                                 }
                                 else    // Create a new image.
                                 {
@@ -312 +308 @@
                                 this.commitContent( IMAGE, this.imageElement );
                                 this.commitContent( LINK, this.linkElement );
 
+                                debugger;
                                 // Insert a new Image.
                                 if ( !this.imageEditMode )
                                 {
@@ -320 +317 @@
                                                 //Insert a new Link.
                                                 if ( !this.linkEditMode )
                                                 {
-                                                        this.linkElement.append( this.imageElement, false );
                                                         editor.insertElement( this.linkElement );
+                                                        this.linkElement.append( this.imageElement, false );
                                                 }
                                                 else    //Link already exists, image not.
                                                         this.linkElement.append( this.imageElement, false );
@@ -334 +331 @@
                                         //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 );
+                                                this.editor.insertElement( this.imageElement );
                                 }
                         },
                         onLoad : function()