X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fsmiley%2Fdialogs%2Fsmiley.js;h=c3c381486d53c17580d60c0be3a62dd43405746d;hb=614511639979907ceb0da3614122a4d8eb963ad4;hp=8371fb13aae939f3388286fbbc6b64584b1860df;hpb=e371ddf8abcb89013e20e6d0dd746adec344d0e5;p=ckeditor.git

diff --git a/_source/plugins/smiley/dialogs/smiley.js b/_source/plugins/smiley/dialogs/smiley.js
index 8371fb1..c3c3814 100644
--- 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,
 					_cke_saved_src : src,
 					title : title,
-					alt : title
+					alt : title,
+					width : target.$.width,
+					height : target.$.height
 				}
 			});
 
@@ -52,8 +54,8 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
 		element = new CKEDITOR.dom.element( element );
 		var relative, nodeToMove;
 
-		var keystroke = ev.getKeystroke();
-		var rtl = editor.lang.dir == 'rtl';
+		var keystroke = ev.getKeystroke(),
+			rtl = editor.lang.dir == 'rtl';
 		switch ( keystroke )
 		{
 			// UP-ARROW
@@ -187,10 +189,15 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
 			dialog = event.sender;
 		},
 		focus : function()
- 		{
-			var firstSmile = this.getElement().getElementsByTag( 'a' ).getItem( 0 );
-			firstSmile.focus();
- 		},
+		{
+			var self = this;
+			// IE need a while to move the focus (#6539).
+			setTimeout( function ()
+			{
+				var firstSmile = self.getElement().getElementsByTag( 'a' ).getItem( 0 );
+				firstSmile.focus();
+			}, 0 );
+		},
 		onClick : onClick,
 		style : 'width: 100%; border-collapse: separate;'
 	};