vanilla ckeditor-3.4.3

[ckeditor.git] / _source / plugins / image / dialogs / image.js

diff --git a/_source/plugins/image/dialogs/image.js b/_source/plugins/image/dialogs/image.js
index 4ebfd16..268185f 100644 (file)
--- a/_source/plugins/image/dialogs/image.js
+++ b/_source/plugins/image/dialogs/image.js
@@ -250,7 +250,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        switchLockRatio( this, false ); // Unlock.\r
                };\r
 \r
-               var numbering = function( id ){ return id + CKEDITOR.tools.getNextNumber(); },\r
+               var numbering = function( id )\r
+                       {\r
+                               return CKEDITOR.tools.getNextId() + '_' + id;\r
+                       },\r
                        btnLockSizesId = numbering( 'btnLockSizes' ),\r
                        btnResetSizeId = numbering( 'btnResetSize' ),\r
                        imagePreviewLoaderId = numbering( 'ImagePreviewLoader' ),\r
@@ -538,7 +541,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                                                        field.setValue( url );          // And call this.onChange()\r
                                                                                                        // Manually set the initial value.(#4191)\r
                                                                                                        field.setInitValue();\r
-                                                                                                       field.focus();\r
                                                                                                }\r
                                                                                        },\r
                                                                                        commit : function( type, element )\r
@@ -575,7 +577,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                        id : 'txtAlt',\r
                                                        type : 'text',\r
                                                        label : editor.lang.image.alt,\r
-                                                       accessKey : 'A',\r
+                                                       accessKey : 'T',\r
                                                        'default' : '',\r
                                                        onChange : function()\r
                                                        {\r
@@ -664,7 +666,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                                                                                                        element.setStyle( 'width',  oImageOriginal.$.width + 'px');\r
                                                                                                                                        }\r
                                                                                                                                        else\r
-                                                                                                                                               element.setStyle( 'width', value + 'px');\r
+                                                                                                                                               element.setStyle( 'width', CKEDITOR.tools.cssLength( value ) );\r
                                                                                                                                }\r
                                                                                                                                else if ( type == CLEANUP )\r
                                                                                                                                {\r
@@ -715,7 +717,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                                                                                                        element.setStyle( 'height', oImageOriginal.$.height + 'px' );\r
                                                                                                                                        }\r
                                                                                                                                        else\r
-                                                                                                                                               element.setStyle( 'height', value + 'px' );\r
+                                                                                                                                               element.setStyle( 'height',  CKEDITOR.tools.cssLength( value ) );\r
                                                                                                                                }\r
                                                                                                                                else if ( type == CLEANUP )\r
                                                                                                                                {\r
@@ -1125,7 +1127,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                        {\r
                                                                action : 'Browse',\r
                                                                target: 'Link:txtUrl',\r
-                                                               url: editor.config.filebrowserImageBrowseLinkUrl || editor.config.filebrowserBrowseUrl\r
+                                                               url: editor.config.filebrowserImageBrowseLinkUrl\r
                                                        },\r
                                                        style : 'float:right',\r
                                                        hidden : true,\r
@@ -1147,7 +1149,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                        setup : function( type, element )\r
                                                        {\r
                                                                if ( type == LINK )\r
-                                                                       this.setValue( element.getAttribute( 'target' ) );\r
+                                                                       this.setValue( element.getAttribute( 'target' ) || '' );\r
                                                        },\r
                                                        commit : function( type, element )\r
                                                        {\r