Changeset 6565 for CKEditor/trunk

Timestamp:

03/18/11 05:11:03 (2 years ago)

Author:

garry.yao

Message:

#6491: Don't reset the dimension lock on image dialog if it's set by user.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/image/dialogs/image.js (modified) (4 diffs)

CKEditor/trunk/CHANGES.html

@@ -80 +80 @@
                 <li><a href="http://dev.ckeditor.com/ticket/6849">#6849</a> : Correct enter key behavior on list item.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/7113">#7113</a> : [Webkit]Undesired document scroll on click after scrolling.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/6491">#6491</a> : Undesired image dialog dimension lock reset on url change.</li>
                 <li>Updated the following language files:<ul>
                         <li><a href="http://dev.ckeditor.com/ticket/7124">#7124</a> : Czech;</li>

CKEditor/trunk/_source/plugins/image/dialogs/image.js

@@ -122 +122 @@
                                 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' ),
@@ -142 +141 @@
                                         }
                                 }
-                                else if ( value != undefined )
-                                        dialog.lockRatio = value;
-                                else
-                                        dialog.lockRatio = !dialog.lockRatio;
                         }
-                        else if ( value != 'check' )            // I can't lock ratio if ratio is unknown.
-                                dialog.lockRatio = false;
-
+                        else if ( value != undefined )
+                                dialog.lockRatio = value;
+                        else
+                        {
+                                dialog.userlockRatio = 1;
+                                dialog.lockRatio = !dialog.lockRatio;
+                        }
+
+                        var ratioButton = CKEDITOR.document.getById( btnLockSizesId );
                         if ( dialog.lockRatio )
                                 ratioButton.removeClass( 'cke_btn_unlocked' );
@@ -276 +277 @@
 
                                 this.lockRatio = true;
+                                this.userlockRatio = 0;
                                 this.dontResetSize = false;
                                 this.firstLoad = true;
@@ -336 +338 @@
                                         // 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.