Ticket #5914: 5914.patch

_source/plugins/smiley/dialogs/smiley.js

@@ -21 +21 @@
                 var target = evt.data.getTarget(),
                         targetName = target.getName();
 
-                if ( targetName == 'td' )
-                        target = target.getChild( [ 0, 0 ] );
-                else if ( targetName == 'a' )
+                if ( targetName == 'a' )
                         target = target.getChild( 0 );
                 else if ( targetName != 'img' )
                         return;
@@ -151 +149 @@
 
                 var smileyLabelId = 'cke_smile_label_' + i + '_' + CKEDITOR.tools.getNextNumber();
                 html.push(
-                        '<td class="cke_dark_background cke_hand cke_centered" style="vertical-align: middle;">' +
+                        '<td class="cke_dark_background cke_centered" style="vertical-align: middle;">' +
                                 '<a href="javascript:void(0)" role="option"',
                                         ' aria-posinset="' + ( i +1 ) + '"',
                                         ' aria-setsize="' + size + '"',
                                         ' aria-labelledby="' + smileyLabelId + '"',
-                                        ' class="cke_smile" tabindex="-1" onkeydown="CKEDITOR.tools.callFunction( ', onKeydown, ', event, this );">',
-                                        '<img class="hand" title="', config.smiley_descriptions[i], '"' +
+                                        ' class="cke_smile cke_hand" tabindex="-1" onkeydown="CKEDITOR.tools.callFunction( ', onKeydown, ', event, this );">',
+                                        '<img class="cke_hand" title="', config.smiley_descriptions[i], '"' +
                                                 ' cke_src="', CKEDITOR.tools.htmlEncode( config.smiley_path + images[ i ] ), '" alt="', config.smiley_descriptions[i], '"',
                                                 ' src="', CKEDITOR.tools.htmlEncode( config.smiley_path + images[ i ] ), '"',
                                                 // IE BUG: Below is a workaround to an IE image loading bug to ensure the image sizes are correct.