vanilla ckeditor-3.3.2

[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 e13439b..5d05d95 100644 (file)
--- a/_source/plugins/smiley/dialogs/smiley.js
+++ b/_source/plugins/smiley/dialogs/smiley.js
@@ -8,7 +8,7 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
        var config = editor.config,\r
                lang = editor.lang.smiley,\r
                images = config.smiley_images,\r
-               columns = 8,\r
+               columns = config.smiley_columns || 8,\r
                i;\r
 \r
        /**\r
@@ -21,9 +21,7 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
                var target = evt.data.getTarget(),\r
                        targetName = target.getName();\r
 \r
-               if ( targetName == 'td' )\r
-                       target = target.getChild( [ 0, 0 ] );\r
-               else if ( targetName == 'a' )\r
+               if ( targetName == 'a' )\r
                        target = target.getChild( 0 );\r
                else if ( targetName != 'img' )\r
                        return;\r
@@ -151,13 +149,13 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
 \r
                var smileyLabelId = 'cke_smile_label_' + i + '_' + CKEDITOR.tools.getNextNumber();\r
                html.push(\r
-                       '<td class="cke_dark_background cke_hand cke_centered" style="vertical-align: middle;">' +\r
+                       '<td class="cke_dark_background cke_centered" style="vertical-align: middle;">' +\r
                                '<a href="javascript:void(0)" role="option"',\r
                                        ' aria-posinset="' + ( i +1 ) + '"',\r
                                        ' aria-setsize="' + size + '"',\r
                                        ' aria-labelledby="' + smileyLabelId + '"',\r
-                                       ' class="cke_smile" tabindex="-1" onkeydown="CKEDITOR.tools.callFunction( ', onKeydown, ', event, this );">',\r
-                                       '<img class="hand" title="', config.smiley_descriptions[i], '"' +\r
+                                       ' class="cke_smile cke_hand" tabindex="-1" onkeydown="CKEDITOR.tools.callFunction( ', onKeydown, ', event, this );">',\r
+                                       '<img class="cke_hand" title="', config.smiley_descriptions[i], '"' +\r
                                                ' cke_src="', CKEDITOR.tools.htmlEncode( config.smiley_path + images[ i ] ), '" alt="', config.smiley_descriptions[i], '"',\r
                                                ' src="', CKEDITOR.tools.htmlEncode( config.smiley_path + images[ i ] ), '"',\r
                                                // IE BUG: Below is a workaround to an IE image loading bug to ensure the image sizes are correct.\r