/*\r
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
For licensing, see LICENSE.html or http://ckeditor.com/license\r
*/\r
\r
var styles = {};\r
for ( var i = 0 ; i < names.length ; i++ )\r
{\r
- var vars = {};\r
- var parts = names[ i ].split( '/' );\r
+ var parts = names[ i ];\r
\r
- var name = names[ i ] = parts[ 0 ];\r
- vars[ styleType ] = values[ i ] = parts[ 1 ] || name;\r
+ if ( parts )\r
+ {\r
+ parts = parts.split( '/' );\r
+\r
+ var vars = {},\r
+ name = names[ i ] = parts[ 0 ];\r
\r
- styles[ name ] = new CKEDITOR.style( styleDefinition, vars );\r
+ 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
}\r
\r
editor.ui.addRichCombo( comboName,\r
{\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 : [ config.contentsCss, CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ],\r
- voiceLabel : lang.panelVoiceLabel\r
+ css : editor.skin.editor.css.concat( config.contentsCss ),\r
+ multiSelect : false,\r
+ attributes : { 'aria-label' : lang.panelTitle }\r
},\r
\r
init : function()\r
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