vanilla ckeditor-3.4.3

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

diff --git a/_source/plugins/smiley/dialogs/smiley.js b/_source/plugins/smiley/dialogs/smiley.js
index 5d05d95..c3c3814 100644 (file)
--- a/_source/plugins/smiley/dialogs/smiley.js
+++ b/_source/plugins/smiley/dialogs/smiley.js
@@ -36,7 +36,9 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
                                        src : src,\r
                                        _cke_saved_src : src,\r
                                        title : title,\r
-                                       alt : title\r
+                                       alt : title,\r
+                                       width : target.$.width,\r
+                                       height : target.$.height\r
                                }\r
                        });\r
 \r
@@ -52,8 +54,8 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
                element = new CKEDITOR.dom.element( element );\r
                var relative, nodeToMove;\r
 \r
-               var keystroke = ev.getKeystroke();\r
-               var rtl = editor.lang.dir == 'rtl';\r
+               var keystroke = ev.getKeystroke(),\r
+                       rtl = editor.lang.dir == 'rtl';\r
                switch ( keystroke )\r
                {\r
                        // UP-ARROW\r
@@ -131,7 +133,7 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
        });\r
 \r
        // Build the HTML for the smiley images table.\r
-       var labelId = 'smiley_emtions_label' + CKEDITOR.tools.getNextNumber();\r
+       var labelId = CKEDITOR.tools.getNextId() + '_smiley_emtions_label';\r
        var html =\r
        [\r
                '<div>' +\r
@@ -187,10 +189,15 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
                        dialog = event.sender;\r
                },\r
                focus : function()\r
-               {\r
-                       var firstSmile = this.getElement().getElementsByTag( 'a' ).getItem( 0 );\r
-                       firstSmile.focus();\r
-               },\r
+               {\r
+                       var self = this;\r
+                       // IE need a while to move the focus (#6539).\r
+                       setTimeout( function ()\r
+                       {\r
+                               var firstSmile = self.getElement().getElementsByTag( 'a' ).getItem( 0 );\r
+                               firstSmile.focus();\r
+                       }, 0 );\r
+               },\r
                onClick : onClick,\r
                style : 'width: 100%; border-collapse: separate;'\r
        };\r