Ticket #4117: 4117_4.patch
File 4117_4.patch, 3.6 KB (added by , 15 years ago) |
---|
-
_source/plugins/selection/plugin.js
783 783 { 784 784 if ( this.isLocked ) 785 785 { 786 var range = new CKEDITOR.dom.range( );786 var range = new CKEDITOR.dom.range( this.document ); 787 787 range.setStartBefore( element ); 788 788 range.setEndAfter( element ); 789 789 -
CHANGES.html
197 197 <li><a href="http://dev.fckeditor.net/ticket/3622">#3622</a> : The toolbar in the v2 198 198 skin was wrapping improperly in some languages.</li> 199 199 <li><a href="http://dev.fckeditor.net/ticket/4119">#4119</a> : Unable to edit image link with image dialog.</li> 200 <li><a href="http://dev.fckeditor.net/ticket/4117">#4117</a> : Fixed dialog error when transforming image into button.</li> 200 201 </ul> 201 202 <h3> 202 203 CKEditor 3.0 RC</h3> -
_source/plugins/image/dialogs/image.js
264 264 // Edit existing Image. 265 265 if ( this.imageEditMode ) 266 266 { 267 var imgTagName = this.imageEditMode, 268 removeObj = this.imageElement; 267 var imgTagName = this.imageEditMode; 269 268 270 269 // Image dialog and Input element. 271 270 if ( dialogType == 'image' && imgTagName == 'input' && confirm( editor.lang.image.button2Img ) ) … … 274 273 imgTagName = 'img'; 275 274 this.imageElement = editor.document.createElement( 'img' ); 276 275 this.imageElement.setAttribute( 'alt', '' ); 277 removeObj.insertBeforeMe( this.imageElement ); 278 removeObj.remove( false ); 279 276 editor.insertElement( this.imageElement ); 280 277 } 281 278 // ImageButton dialog and Image element. 282 279 else if ( dialogType != 'image' && imgTagName == 'img' && confirm( editor.lang.image.img2Button )) … … 290 287 alt : '' 291 288 } 292 289 ); 293 removeObj.insertBeforeMe( this.imageElement ); 294 removeObj.remove( false ); 290 editor.insertElement( this.imageElement ); 295 291 } 296 292 } 297 293 else // Create a new image. … … 323 319 //Insert a new Link. 324 320 if ( !this.linkEditMode ) 325 321 { 326 this.linkElement.append( this.imageElement, false);327 editor.insertElement( this.linkElement);322 editor.insertElement(this.linkElement); 323 this.linkElement.append(this.imageElement, false); 328 324 } 329 else 330 this.linkElement.append( this.imageElement, false);325 else //Link already exists, image not. 326 editor.insertElement(this.imageElement ); 331 327 } 332 328 else 333 329 editor.insertElement( this.imageElement ); … … 337 333 //Add a new link element. 338 334 if ( !this.linkEditMode && this.addLink ) 339 335 { 340 this.imageElement.insertBeforeMe( this.linkElement );336 editor.insertElement( this.linkElement ); 341 337 this.imageElement.appendTo( this.linkElement ); 342 338 } 343 339 //Remove Link, Image exists. 344 340 else if ( this.linkEditMode && !this.addLink ) 345 this.linkElement.remove( true ); 346 } 341 { 342 editor.getSelection().selectElement( this.linkElement ); 343 console.log( 'select link element' ); 344 editor.insertElement( this.imageElement ); 345 } 346 } 347 347 }, 348 348 onLoad : function() 349 349 {