vanilla ckeditor-3.6.1

[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 c604ebd..e793a89 100644 (file)
--- a/_source/plugins/image/dialogs/image.js
+++ b/_source/plugins/image/dialogs/image.js
@@ -115,6 +115,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
                var switchLockRatio = function( dialog, value )\r
                {\r
+                       if ( !dialog.getContentElement( 'info', 'ratioLock' ) )\r
+                               return null;\r
+\r
                        var oImageOriginal = dialog.originalElement;\r
 \r
                        // Dialog may already closed. (#5505)\r
@@ -155,11 +158,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        else\r
                                ratioButton.addClass( 'cke_btn_unlocked' );\r
 \r
-                       var lang = dialog._.editor.lang.image,\r
-                               label =  lang[  dialog.lockRatio ? 'unlockRatio' : 'lockRatio' ];\r
+                       ratioButton.setAttribute( 'aria-checked', dialog.lockRatio );\r
 \r
-                       ratioButton.setAttribute( 'title', label );\r
-                       ratioButton.getFirst().setText( label );\r
+                       // Ratio button hc presentation - WHITE SQUARE / BLACK SQUARE\r
+                       if ( CKEDITOR.env.hc )\r
+                       {\r
+                               var icon = ratioButton.getChild( 0 );\r
+                               icon.setHtml(  dialog.lockRatio ? CKEDITOR.env.ie ? '\u25A0': '\u25A3' : CKEDITOR.env.ie ? '\u25A1' : '\u25A2' );\r
+                       }\r
 \r
                        return dialog.lockRatio;\r
                };\r
@@ -169,8 +175,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        var oImageOriginal = dialog.originalElement;\r
                        if ( oImageOriginal.getCustomData( 'isReady' ) == 'true' )\r
                        {\r
-                               dialog.setValueOf( 'info', 'txtWidth', oImageOriginal.$.width );\r
-                               dialog.setValueOf( 'info', 'txtHeight', oImageOriginal.$.height );\r
+                               var widthField = dialog.getContentElement( 'info', 'txtWidth' ),\r
+                                       heightField = dialog.getContentElement( 'info', 'txtHeight' );\r
+                               widthField && widthField.setValue( oImageOriginal.$.width );\r
+                               heightField && heightField.setValue( oImageOriginal.$.height );\r
                        }\r
                        updatePreview( dialog );\r
                };\r
@@ -451,8 +459,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                if ( dialogType != 'image' )\r
                                        this.hidePage( 'Link' );                //Hide Link tab.\r
                                var doc = this._.element.getDocument();\r
-                               this.addFocusable( doc.getById( btnResetSizeId ), 5 );\r
-                               this.addFocusable( doc.getById( btnLockSizesId ), 5 );\r
+\r
+                               if ( this.getContentElement( 'info', 'ratioLock' ) )\r
+                               {\r
+                                       this.addFocusable( doc.getById( btnResetSizeId ), 5 );\r
+                                       this.addFocusable( doc.getById( btnLockSizesId ), 5 );\r
+                               }\r
 \r
                                this.commitContent = commitContent;\r
                        },\r
@@ -612,6 +624,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                        children :\r
                                                        [\r
                                                                {\r
+                                                                       id : 'basic',\r
                                                                        type : 'vbox',\r
                                                                        children :\r
                                                                        [\r
@@ -728,6 +741,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                                                        ]\r
                                                                                                },\r
                                                                                                {\r
+                                                                                                       id : 'ratioLock',\r
                                                                                                        type : 'html',\r
                                                                                                        style : 'margin-top:30px;width:40px;height:40px;',\r
                                                                                                        onLoad : function()\r
@@ -769,7 +783,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                                                                                                        updatePreview( this );\r
                                                                                                                                                }\r
                                                                                                                                        }\r
-                                                                                                                                       evt.data.preventDefault();\r
+                                                                                                                                       evt.data && evt.data.preventDefault();\r
                                                                                                                                }, this.getDialog() );\r
                                                                                                                        ratioButton.on( 'mouseover', function()\r
                                                                                                                                {\r
@@ -782,8 +796,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                                                                }\r
                                                                                                        },\r
                                                                                                        html : '<div>'+\r
-                                                                                                               '<a href="javascript:void(0)" tabindex="-1" title="' + editor.lang.image.unlockRatio +\r
-                                                                                                               '" class="cke_btn_locked" id="' + btnLockSizesId + '" role="button"><span class="cke_label">' + editor.lang.image.unlockRatio + '</span></a>' +\r
+                                                                                                               '<a href="javascript:void(0)" tabindex="-1" title="' + editor.lang.image.lockRatio +\r
+                                                                                                               '" class="cke_btn_locked" id="' + btnLockSizesId + '" role="checkbox"><span class="cke_icon"></span><span class="cke_label">' + editor.lang.image.lockRatio + '</span></a>' +\r
                                                                                                                '<a href="javascript:void(0)" tabindex="-1" title="' + editor.lang.image.resetSize +\r
                                                                                                                '" class="cke_btn_reset" id="' + btnResetSizeId + '" role="button"><span class="cke_label">' + editor.lang.image.resetSize + '</span></a>'+\r
                                                                                                                '</div>'\r
@@ -1059,6 +1073,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                        [\r
                                                                                {\r
                                                                                        type : 'html',\r
+                                                                                       id : 'htmlPreview',\r
                                                                                        style : 'width:95%;',\r
                                                                                        html : '<div>' + CKEDITOR.tools.htmlEncode( editor.lang.common.preview ) +'<br>'+\r
                                                                                        '<div id="' + imagePreviewLoaderId + '" class="ImagePreviewLoader" style="display:none"><div class="loading">&nbsp;</div></div>'+\r