Ticket #6491: 6491_2.patch

_source/plugins/image/dialogs/image.js

@@ -121 +121 @@
                         if( !oImageOriginal )
                                 return null;
 
-                        var ratioButton = CKEDITOR.document.getById( btnLockSizesId );
-
-                        if ( oImageOriginal.getCustomData( 'isReady' ) == 'true' )
+                        // Check image ratio and original image ratio, but respecting user's preference.
+                        if ( value == 'check' )
                         {
-                                if ( value == 'check' )                 // Check image ratio and original image ratio.
+                                if ( !dialog.userlockRatio && oImageOriginal.getCustomData( 'isReady' ) == 'true'  )
                                 {
                                         var width = dialog.getValueOf( 'info', 'txtWidth' ),
                                                 height = dialog.getValueOf( 'info', 'txtHeight' ),
@@ -141 +140 @@
                                                         dialog.lockRatio = true;
                                         }
                                 }
-                                else if ( value != undefined )
-                                        dialog.lockRatio = value;
-                                else
-                                        dialog.lockRatio = !dialog.lockRatio;
+                        }
+                        else if ( value != undefined )
+                                dialog.lockRatio = value;
+                        else
+                        {
+                                dialog.userlockRatio = 1;
+                                dialog.lockRatio = !dialog.lockRatio;
                         }
-                        else if ( value != 'check' )            // I can't lock ratio if ratio is unknown.
-                                dialog.lockRatio = false;
 
+                        var ratioButton = CKEDITOR.document.getById( btnLockSizesId );
                         if ( dialog.lockRatio )
                                 ratioButton.removeClass( 'cke_btn_unlocked' );
                         else
@@ -275 +276 @@
                                 this.linkEditMode = false;
 
                                 this.lockRatio = true;
+                                this.userlockRatio = 0;
                                 this.dontResetSize = false;
                                 this.firstLoad = true;
                                 this.addLink = false;
@@ -335 +337 @@
 
                                         // Fill out all fields.
                                         this.setupContent( IMAGE, this.imageElement );
-
-                                        // Refresh LockRatio button
-                                        switchLockRatio ( this, true );
                                 }
                                 else
                                         this.imageElement =  editor.document.createElement( 'img' );
 
+                                // Refresh LockRatio button
+                                switchLockRatio ( this, true );
+
                                 // Dont show preview if no URL given.
                                 if ( !CKEDITOR.tools.trim( this.getValueOf( 'info', 'txtUrl' ) ) )
                                 {