Ticket #4479: 4479_2.patch

_source/plugins/stylescombo/plugin.js

@@ -16 +16 @@
                         var config = editor.config,
                                 lang = editor.lang.stylesCombo,
                                 pluginPath = this.path,
-                                styles;
+                                styles = {},
+                                stylesList = [];
 
                         if ( !stylesManager )
                                 stylesManager = CKEDITOR.stylesSet;
@@ -30 +31 @@
                                                 comboStylesSet.slice( 1 ).join( ':' ) :
                                                 pluginPath + 'styles/' + styleSetName + '.js', '' );
 
-                        editor.ui.addRichCombo( 'Styles',
-                                {
-                                        label : lang.label,
-                                        title : lang.panelTitle,
-                                        className : 'cke_styles',
-
-                                        panel :
-                                        {
-                                                css : editor.skin.editor.css.concat( config.contentsCss ),
-                                                multiSelect : true,
-                                                attributes : { 'aria-label' : lang.panelTitle }
-                                        },
-
-                                        init : function()
-                                        {
-                                                var combo = this;
-
-                                                CKEDITOR.stylesSet.load( styleSetName, function( stylesSet )
-                                                        {
-                                                                var stylesDefinitions = stylesSet[ styleSetName ],
-                                                                        style,
-                                                                        styleName,
-                                                                        stylesList = [];
+                        function loadStylesSet( callback )
+                   {
+                           CKEDITOR.stylesSet.load( styleSetName, function( stylesSet )
+                                   {
+                                           if ( !stylesList.length )
+                                           {
+                                                   var stylesDefinitions = stylesSet[ styleSetName ],
+                                                           style,
+                                                           styleName;
 
-                                                                styles = {};
-
-                                                                // Put all styles into an Array.
-                                                                for ( var i = 0 ; i < stylesDefinitions.length ; i++ )
-                                                                {
-                                                                        var styleDefinition = stylesDefinitions[ i ];
+                                                   // Put all styles into an Array.
+                                                   for ( var i = 0 ; i < stylesDefinitions.length ; i++ )
+                                                   {
+                                                           var styleDefinition = stylesDefinitions[ i ];
 
-                                                                        styleName = styleDefinition.name;
+                                                           styleName = styleDefinition.name;
 
-                                                                        style = styles[ styleName ] = new CKEDITOR.style( styleDefinition );
-                                                                        style._name = styleName;
+                                                           style = styles[ styleName ] = new CKEDITOR.style( styleDefinition );
+                                                           style._name = styleName;
 
-                                                                        stylesList.push( style );
-                                                                }
+                                                           stylesList.push( style );
+                                                   }
 
-                                                                // Sorts the Array, so the styles get grouped
-                                                                // by type.
-                                                                stylesList.sort( sortStyles );
+                                                   // Sorts the Array, so the styles get grouped
+                                                   // by type.
+                                                   stylesList.sort( sortStyles );
+                                           }
 
+                                           callback && callback();
+                                   });
+                   }
+
+                        editor.ui.addRichCombo( 'Styles',
+                                {
+                                        label : lang.label,
+                                        title : lang.panelTitle,
+                                        className : 'cke_styles',
+
+                                        panel :
+                                        {
+                                                css : editor.skin.editor.css.concat( config.contentsCss ),
+                                                multiSelect : true,
+                                                attributes : { 'aria-label' : lang.panelTitle }
+                                        },
+
+                                        init : function()
+                                        {
+                                                var combo = this;
+
+                                                loadStylesSet( function()
+                                                        {
+                                                                var style, styleName;
+
                                                                 // Loop over the Array, adding all items to the
                                                                 // combo.
                                                                 var lastType;
-                                                                for ( i = 0 ; i < stylesList.length ; i++ )
+                                                                for ( var i = 0 ; i < stylesList.length ; i++ )
                                                                 {
                                                                         style = stylesList[ i ];
                                                                         styleName = style._name;
@@ -191 +202 @@
                                                         this.hideGroup( lang[ 'panelTitle' + String( CKEDITOR.STYLE_OBJECT ) ] );
                                         }
                                 });
+
+                        editor.on( 'instanceReady', function() { loadStylesSet(); } );
                 }
         });