vanilla ckeditor-3.0.1

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

diff --git a/_source/plugins/stylescombo/plugin.js b/_source/plugins/stylescombo/plugin.js
index 1a336d3..33b2cbc 100644 (file)
--- a/_source/plugins/stylescombo/plugin.js
+++ b/_source/plugins/stylescombo/plugin.js
@@ -26,15 +26,18 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
                                        panel :\r
                                        {\r
-                                               css : [ config.contentsCss, CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ],\r
+                                               css : [ CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ].concat( config.contentsCss ),\r
                                                voiceLabel : lang.panelVoiceLabel\r
                                        },\r
 \r
                                        init : function()\r
                                        {\r
                                                var combo = this,\r
-                                                       stylesSet = config.stylesCombo_stylesSet.split( ':', 2 ),\r
-                                                       stylesSetPath = stylesSet[ 1 ] || CKEDITOR.getUrl( pluginPath + 'styles/' + stylesSet[ 0 ] + '.js' ) ;\r
+                                                       stylesSet = config.stylesCombo_stylesSet.split( ':' );\r
+\r
+                                               var stylesSetPath = stylesSet[ 1 ] ?\r
+                                                               stylesSet.slice( 1 ).join( ':' ) :              // #4481\r
+                                                               CKEDITOR.getUrl( pluginPath + 'styles/' + stylesSet[ 0 ] + '.js' ) ;\r
 \r
                                                stylesSet = stylesSet[ 0 ];\r
 \r