Ticket #3846: 3846_3.patch

_source/plugins/image/dialogs/image.js

@@ -444 +444 @@
                                         this.originalElement.remove();
                                         this.originalElement = false;           // Dialog is closed.
                                 }
-
+                                
+                                // Image dialog cannot load image attributes #3846;
+                                if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera ) )
+                                {
+                                        editor.getSelection().unlock();
+                                }
+                                
                                 delete this.imageElement;
                         },
                         contents : [

_source/plugins/wysiwygarea/plugin.js

@@ -385 +385 @@
 
                                                 domWindow       = editor.window         = new CKEDITOR.dom.window( domWindow );
                                                 domDocument     = editor.document       = new CKEDITOR.dom.document( domDocument );
-
+                                                
                                                 // Gecko/Webkit need some help when selecting control type elements. (#3448)
-                                                if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera) )
+                                                if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera ) )
                                                 {
                                                         domDocument.on( 'mousedown', function( ev )
                                                         {
                                                                 var control = ev.data.getTarget();
+                                                                // Image dialog cannot load image attributes #3846;
+                                                                editor.getSelection().unlock( true );
+                                                                if ( control.is( 'img') )
+                                                                        editor.getSelection().lock();
                                                                 if ( control.is( 'img', 'hr', 'input', 'textarea', 'select' ) )
                                                                         editor.getSelection().selectElement( control );
                                                         } );