Ticket #5290: 5290.patch

_source/plugins/div/dialogs/div.js

@@ -436 +436 @@
 
                                 // Preparing for the 'elementStyle' field.
                                 var dialog = this,
-                                         stylesField = this.getContentElement( 'info', 'elementStyle' ),
-                                         // Reuse the 'stylescombo' plugin's styles definition.
-                                         customStylesConfig =  editor.config.stylesCombo_stylesSet,
-                                         stylesSetName = customStylesConfig && customStylesConfig.split( ':' )[ 0 ];
+                                         stylesField = this.getContentElement( 'info', 'elementStyle' );
 
-                                if ( stylesSetName )
+                                 // Reuse the 'stylescombo' plugin's styles definition.
+                                editor.getStylesSet && editor.getStylesSet( function( stylesDefinitions )
                                 {
-                                        CKEDITOR.stylesSet.load( stylesSetName,
-                                                function( stylesSet )
-                                                {
-                                                        var stylesDefinitions = stylesSet[ stylesSetName ],
-                                                                styleName;
+                                        var styleName;
 
-                                                        if ( stylesDefinitions )
+                                        if ( stylesDefinitions )
+                                        {
+                                                // Digg only those styles that apply to 'div'.
+                                                for ( var i = 0 ; i < stylesDefinitions.length ; i++ )
+                                                {
+                                                        var styleDefinition = stylesDefinitions[ i ];
+                                                        if ( styleDefinition.element && styleDefinition.element == 'div' )
                                                         {
-                                                                // Digg only those styles that apply to 'div'.
-                                                                for ( var i = 0 ; i < stylesDefinitions.length ; i++ )
-                                                                {
-                                                                        var styleDefinition = stylesDefinitions[ i ];
-                                                                        if ( styleDefinition.element && styleDefinition.element == 'div' )
-                                                                        {
-                                                                                styleName = styleDefinition.name;
-                                                                                styles[ styleName ] = new CKEDITOR.style( styleDefinition );
+                                                                styleName = styleDefinition.name;
+                                                                styles[ styleName ] = new CKEDITOR.style( styleDefinition );
 
-                                                                                // Populate the styles field options with style name.
-                                                                                stylesField.items.push( [ styleName, styleName ] );
-                                                                                stylesField.add( styleName, styleName );
-                                                                        }
-                                                                }
+                                                                // Populate the styles field options with style name.
+                                                                stylesField.items.push( [ styleName, styleName ] );
+                                                                stylesField.add( styleName, styleName );
                                                         }
+                                                }
+                                        }
 
+                                        // We should disable the content element
+                                        // it if no options are available at all.
+                                        stylesField[ stylesField.items.length > 1 ? 'enable' : 'disable' ]();
 
-                                                        // We should disable the content element
-                                                        // it if no options are available at all.
-                                                        stylesField[ stylesField.items.length > 1 ? 'enable' : 'disable' ]();
-
-                                                        // Now setup the field value manually.
-                                                        setTimeout( function() { stylesField.setup( dialog._element ); }, 0 );
-                                                } );
-                                }
+                                        // Now setup the field value manually.
+                                        setTimeout( function() { stylesField.setup( dialog._element ); }, 0 );
+                                } );
                         },
                         onShow : function()
                         {

_source/plugins/stylescombo/plugin.js

@@ -5 +5 @@
 
 (function()
 {
-        var stylesManager;
-
         CKEDITOR.plugins.add( 'stylescombo',
         {
                 requires : [ 'richcombo', 'styles' ],
@@ -15 +13 @@
                 {
                         var config = editor.config,
                                 lang = editor.lang.stylesCombo,
-                                pluginPath = this.path,
                                 styles;
 
-                        if ( !stylesManager )
-                                stylesManager = CKEDITOR.stylesSet;
-
-                        var comboStylesSet = config.stylesCombo_stylesSet.split( ':' ),
-                                styleSetName = comboStylesSet[ 0 ],
-                                externalPath = comboStylesSet[ 1 ];
-
-                        stylesManager.addExternal( styleSetName,
-                                        externalPath ?
-                                                comboStylesSet.slice( 1 ).join( ':' ) :
-                                                pluginPath + 'styles/' + styleSetName + '.js', '' );
-
                         editor.ui.addRichCombo( 'Styles',
                                 {
                                         label : lang.label,
@@ -47 +32 @@
                                         {
                                                 var combo = this;
 
-                                                CKEDITOR.stylesSet.load( styleSetName, function( stylesSet )
+                                                editor.getStylesSet( function( stylesDefinitions )
                                                         {
-                                                                var stylesDefinitions = stylesSet[ styleSetName ],
-                                                                        style,
+                                                                var style,
                                                                         styleName,
                                                                         stylesList = [];
 
@@ -260 +244 @@
 })();
 
 /**
+ * Gets the current styleset for this instance
+ * @param {Function} The function to be called with the styles data.
+ * @example
+ * editor.getStylesSet( function( stylesDefinitions ) {} );
+ */
+CKEDITOR.editor.prototype.getStylesSet = function( callback )
+{
+        if (!this._.stylesDefinitions)
+        {
+                var editor = this,
+                        comboStylesSet = editor.config.stylesCombo_stylesSet.split( ':' ),
+                        styleSetName = comboStylesSet[ 0 ],
+                        externalPath = comboStylesSet[ 1 ],
+                        pluginPath = CKEDITOR.plugins.registered.stylescombo.path;
+
+                CKEDITOR.stylesSet.addExternal( styleSetName,
+                                externalPath ?
+                                        comboStylesSet.slice( 1 ).join( ':' ) :
+                                        pluginPath + 'styles/' + styleSetName + '.js', '' );
+
+
+                CKEDITOR.stylesSet.load( styleSetName, function( stylesSet )
+                        {
+                                editor._.stylesDefinitions = stylesSet[ styleSetName ];
+                                callback( editor._.stylesDefinitions );
+                        } ) ;
+        }
+        else
+                callback( this._.stylesDefinitions );
+};
+
+/**
  * The "styles definition set" to load into the styles combo. The styles may
  * be defined in the page containing the editor, or can be loaded on demand
  * from an external file when opening the styles combo for the fist time. In