X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fsmiley%2Fdialogs%2Fsmiley.js;h=e13439b6a301d9c4f70999a3a0c29911bc4e54a6;hb=8665a7c6c60586526e32e8941fe2896739b6ebfb;hp=dfe0a50f5c8ec59e4b07e218b0902a72a5a7b538;hpb=059b4c2fef02528bf1af189f7996e80652faddfb;p=ckeditor.git

diff --git a/_source/plugins/smiley/dialogs/smiley.js b/_source/plugins/smiley/dialogs/smiley.js
index dfe0a50..e13439b 100644
--- a/_source/plugins/smiley/dialogs/smiley.js
+++ b/_source/plugins/smiley/dialogs/smiley.js
@@ -55,6 +55,7 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
 		var relative, nodeToMove;
 
 		var keystroke = ev.getKeystroke();
+		var rtl = editor.lang.dir == 'rtl';
 		switch ( keystroke )
 		{
 			// UP-ARROW
@@ -86,7 +87,7 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
 				break;
 
 			// RIGHT-ARROW
-			case 39 :
+			case rtl ? 37 : 39 :
 			// TAB
 			case 9 :
 				// relative is TD
@@ -107,7 +108,7 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
 				break;
 
 			// LEFT-ARROW
-			case 37 :
+			case rtl ? 39 : 37 :
 			// SHIFT + TAB
 			case CKEDITOR.SHIFT + 9 :
 				// relative is TD
@@ -132,11 +133,12 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
 	});
 
 	// Build the HTML for the smiley images table.
+	var labelId = 'smiley_emtions_label' + CKEDITOR.tools.getNextNumber();
 	var html =
 	[
 		'<div>' +
-		'<span id="smiley_emtions_label" class="cke_voice_label">' + editor.lang.common.options +'</span>',
-		'<table role="listbox" aria-labelledby="smiley_emtions_label" style="width:100%;height:100%" cellspacing="2" cellpadding="2"',
+		'<span id="' + labelId + '" class="cke_voice_label">' + lang.options +'</span>',
+		'<table role="listbox" aria-labelledby="' + labelId + '" style="width:100%;height:100%" cellspacing="2" cellpadding="2"',
 		CKEDITOR.env.ie && CKEDITOR.env.quirks ? ' style="position:absolute;"' : '',
 		'><tbody>'
 	];
@@ -147,12 +149,13 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
 		if ( i % columns === 0 )
 			html.push( '<tr>' );
 
+		var smileyLabelId = 'cke_smile_label_' + i + '_' + CKEDITOR.tools.getNextNumber();
 		html.push(
 			'<td class="cke_dark_background cke_hand cke_centered" style="vertical-align: middle;">' +
 				'<a href="javascript:void(0)" role="option"',
 					' aria-posinset="' + ( i +1 ) + '"',
 					' aria-setsize="' + size + '"',
-					' aria-labelledby="cke_smile_label_' + i + '"',
+					' aria-labelledby="' + smileyLabelId + '"',
 					' class="cke_smile" tabindex="-1" onkeydown="CKEDITOR.tools.callFunction( ', onKeydown, ', event, this );">',
 					'<img class="hand" title="', config.smiley_descriptions[i], '"' +
 						' cke_src="', CKEDITOR.tools.htmlEncode( config.smiley_path + images[ i ] ), '" alt="', config.smiley_descriptions[i], '"',
@@ -160,7 +163,7 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
 						// IE BUG: Below is a workaround to an IE image loading bug to ensure the image sizes are correct.
 						( CKEDITOR.env.ie ? ' onload="this.setAttribute(\'width\', 2); this.removeAttribute(\'width\');" ' : '' ),
 					'>' +
-					'<span id="cke_smile_label_' + i + '" class="cke_voice_label">' +config.smiley_descriptions[ i ]  + '</span>' +
+					'<span id="' + smileyLabelId + '" class="cke_voice_label">' +config.smiley_descriptions[ i ]  + '</span>' +
 				'</a>',
  			'</td>' );
 
@@ -191,7 +194,7 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
 			firstSmile.focus();
  		},
 		onClick : onClick,
-		style : 'width: 100%; height: 100%; border-collapse: separate;'
+		style : 'width: 100%; border-collapse: separate;'
 	};
 
 	return {