vanilla ckeditor-3.2.1

[ckeditor.git] / _source / plugins / font / plugin.js

diff --git a/_source/plugins/font/plugin.js b/_source/plugins/font/plugin.js
index 02e86df..8dba467 100644 (file)
--- a/_source/plugins/font/plugin.js
+++ b/_source/plugins/font/plugin.js
@@ -29,6 +29,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                vars[ styleType ] = values[ i ] = parts[ 1 ] || name;\r
 \r
                                styles[ name ] = new CKEDITOR.style( styleDefinition, vars );\r
+                               styles[ name ]._.definition.name = name;\r
                        }\r
                        else\r
                                names.splice( i--, 1 );\r
@@ -38,14 +39,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        {\r
                                label : lang.label,\r
                                title : lang.panelTitle,\r
-                               voiceLabel : lang.voiceLabel,\r
                                className : 'cke_' + ( styleType == 'size' ? 'fontSize' : 'font' ),\r
-                               multiSelect : false,\r
-\r
                                panel :\r
                                {\r
                                        css : editor.skin.editor.css.concat( config.contentsCss ),\r
-                                       voiceLabel : lang.panelVoiceLabel\r
+                                       multiSelect : false,\r
+                                       attributes : { 'aria-label' : lang.panelTitle }\r
                                },\r
 \r
                                init : function()\r
@@ -57,7 +56,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                var name = names[ i ];\r
 \r
                                                // Add the tag entry to the panel list.\r
-                                               this.add( name, '<span style="font-' + styleType + ':' + values[ i ] + '">' + name + '</span>', name );\r
+                                               this.add( name, styles[ name ].buildPreview(), name );\r
                                        }\r
                                },\r
 \r