Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.1.1
[ckeditor.git]
/
_source
/
plugins
/
font
/
plugin.js
diff --git
a/_source/plugins/font/plugin.js
b/_source/plugins/font/plugin.js
index
8b3fb02
..
02e86df
100644
(file)
--- a/
_source/plugins/font/plugin.js
+++ b/
_source/plugins/font/plugin.js
@@
-1,5
+1,5
@@
/*
\r
/*
\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
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
@@
-17,13
+17,21
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
var styles = {};
\r
for ( var i = 0 ; i < names.length ; i++ )
\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
\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
+ vars[ styleType ] = values[ i ] = parts[ 1 ] || name;
\r
\r
\r
- styles[ name ] = new CKEDITOR.style( styleDefinition, vars );
\r
+ styles[ name ] = new CKEDITOR.style( styleDefinition, vars );
\r
+ }
\r
+ else
\r
+ names.splice( i--, 1 );
\r
}
\r
\r
editor.ui.addRichCombo( comboName,
\r
}
\r
\r
editor.ui.addRichCombo( comboName,
\r
@@
-36,7
+44,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
panel :
\r
{
\r
\r
panel :
\r
{
\r
- css : [ CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ].concat( config.contentsCss ),
\r
+ css : editor.skin.editor.css.concat( config.contentsCss ),
\r
voiceLabel : lang.panelVoiceLabel
\r
},
\r
\r
voiceLabel : lang.panelVoiceLabel
\r
},
\r
\r