Ticket #4973: 4973_2.patch

_source/plugins/stylescombo/plugin.js

@@ -32 +32 @@
 
                                         init : function()
                                         {
-                                                var combo = this,
-                                                        stylesSet = config.stylesCombo_stylesSet.split( ':' );
+                                                var combo = this;
 
-                                                var stylesSetPath = stylesSet[ 1 ] ?
-                                                                stylesSet.slice( 1 ).join( ':' ) :              // #4481
-                                                                CKEDITOR.getUrl( pluginPath + 'styles/' + stylesSet[ 0 ] + '.js' ) ;
-
-                                                stylesSet = stylesSet[ 0 ];
-
-                                                CKEDITOR.loadStylesSet( stylesSet, stylesSetPath, function( stylesDefinitions )
+                                                CKEDITOR.stylesSet.load( styleSetName, function( stylesSet )
                                                         {
-                                                                var style,
+                                                                var stylesDefinitions = stylesSet[ styleSetName ],
+                                                                        style,
                                                                         styleName,
                                                                         stylesList = [];
 
@@ -204 +198 @@
                                                         this.hideGroup( lang[ 'panelTitle' + String( CKEDITOR.STYLE_OBJECT ) ] );
                                         }
                                 });
-                }
-        });
 
-        var stylesSets = {};
+                        var stylesSet = config.stylesCombo_stylesSet.split( ':' ),
+                                styleSetName = stylesSet[ 0 ],
+                                externalPath = stylesSet[ 1 ];
 
-        CKEDITOR.addStylesSet = function( name, styles )
-        {
-                stylesSets[ name ] = styles;
-        };
+                        CKEDITOR.stylesSet.addExternal( styleSetName,
+                                        externalPath ? stylesSet.slice( 1 ).join( ':' ) : pluginPath + 'styles/',
+                                        externalPath ? '' : styleSetName + '.js' );
 
-        CKEDITOR.loadStylesSet = function( name, url, callback )
-        {
-                var stylesSet = stylesSets[ name ];
-
-                if ( stylesSet )
-                {
-                        callback( stylesSet );
-                        return ;
                 }
-
-                CKEDITOR.scriptLoader.load( url, function()
-                        {
-                                callback( stylesSets[ name ] );
-                        });
-        };
+        });
 
+        // Custom stylesSets as global resources.
+        CKEDITOR.stylesSet = new CKEDITOR.resourceManager( '', 'stylesSet' );
+        
         function buildPreview( styleDefinition )
         {
                 var html = [];

_source/plugins/stylescombo/styles/default.js

@@ -3 +3 @@
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
-CKEDITOR.addStylesSet( 'default',
+CKEDITOR.stylesSet.add( 'default',
 [
         /* Block Styles */
 

_source/plugins/div/dialogs/div.js

@@ -259 +259 @@
                         return groups;
                 }
 
+                // Synchronous field values to other impacted fields is required, e.g. div styles
+                // change should also alter inline-style text.
+                function commitInternally( targetFields )
+                {
+                        var dialog = this.getDialog(),
+                                 element = new CKEDITOR.dom.element( 'div' );
+
+                        // Commit this field and broadcast to target fields.
+                        this.commit( element, true );
+
+                        targetFields = [].concat( targetFields );
+                        var length = targetFields.length, field;
+                        for ( var i = 0; i < length; i++ )
+                        {
+                                field = dialog.getContentElement.apply( dialog, targetFields[ i ].split( ':' ) );
+                                field && field.setup && field.setup( element, true );
+                        }
+                }
+
+
+                // Registered 'CKEDITOR.style' instances.
+                var styles = {} ;
                 /**
                  * Hold a collection of created block container elements.
                  */
@@ -290 +312 @@
                                                                 label :editor.lang.div.styleSelectLabel,
                                                                 'default' : '',
                                                                 items : [],
+                                                                onChange : function()
+                                                                {
+                                                                        commitInternally        .call( this, [ 'info:class', 'advanced:dir', 'advanced:style' ] );
+                                                                },
                                                                 setup : function( element )
                                                                 {
-                                                                        this.setValue( element.$.style.cssText || '' );
+                                                                        for ( var name in styles )
+                                                                                styles[ name ].checkElementRemovable( element, true ) && this.setValue( name );
                                                                 },
                                                                 commit: function( element )
                                                                 {
-                                                                        if ( this.getValue() )
-                                                                                element.$.style.cssText = this.getValue();
-                                                                        else
-                                                                                element.removeAttribute( 'style' );
+                                                                        var styleName;
+                                                                        if ( styleName = this.getValue() )
+                                                                                styles[ styleName ].applyToObject( element )
                                                                 }
                                                         },
                                                         {
@@ -351 +377 @@
                                                                                         id :'style',
                                                                                         style :'width: 100%;',
                                                                                         label :editor.lang.common.cssStyle,
-                                                                                        'default' : ''
-                                                                                }
+                                                                                        'default' : '',
+                                                                                        commit : function( element )
+                                                                                        {
+                                                                                                var style = element.$.style;
+                                                                                                // Merge with 'elementStyle', which is of higher priority.
+                                                                                                style.cssText = this.getValue() + ';' + style.cssText;
+                                                                                        }
+                                                                                }
                                                                 ]
                                                         },
                                                         {
@@ -376 +408 @@
                                                                 'default' : '',
                                                                 items :
                                                                 [
+                                                                        [ editor.lang.common.notSet , '' ],
                                                                         [
                                                                                 editor.lang.common.langDirLtr,
                                                                                 'ltr'
@@ -394 +427 @@
                         onLoad : function()
                         {
                                 setupFields.call(this);
+
+                                // 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,
+                                         customStylesSetName = customStylesConfig && customStylesConfig.split( ':' )[ 0 ];
+
+                                stylesField.add( editor.lang.common.notSet, '' );
+                                customStylesSetName && CKEDITOR.stylesSet.load( customStylesSetName,
+                                        function( stylesSet )
+                                        {
+                                                var stylesDefinitions = stylesSet[ customStylesSetName ],
+                                                        style, styleName;
+
+                                                if( stylesDefinitions )
+                                                {
+                                                        for ( var i = 0 ; i < stylesDefinitions.length ; i++ )
+                                                        {
+                                                                var styleDefinition = stylesDefinitions[ i ];
+                                                                if( styleDefinition.element && styleDefinition.element == 'div' )
+                                                                {
+                                                                        styleName = styleDefinition.name;
+                                                                        style = styles[ styleName ] = new CKEDITOR.style( styleDefinition );
+                                                                        // Populate the styles field options with style name.
+                                                                        stylesField.items.push( [ styleName, styleName ] );
+                                                                        stylesField.add( styleName, styleName );
+                                                                }
+                                                        }
+                                                }
+
+                                                // We should disable it if no styles are available.
+                                                var fieldBox =  stylesField.getElement().getParent();
+                                                stylesField.items.length ? fieldBox.removeStyle( 'display' ) : fieldBox.setStyle( 'display', 'none' );
+                                                // Now setup the field value manually.
+                                                setTimeout( function() { stylesField.setup( dialog._element ); }, 0 );
+                                        } );
                         },
                         onShow : function()
                         {
@@ -416 +486 @@
                                         containers = createDiv( editor, true );
 
                                 // Update elements attributes
-                                for( var i = 0 ; i < containers.length ; i++ )
+                                for ( var i = 0; i < containers.length; i++ )
+                                {
                                         this.commitContent( containers[ i ] );
+                                        // Remove empty style attribute.
+                                        !containers[ i ].getAttribute( 'style' ) && containers[ i ].removeAttribute( 'style' );
+                                }
+
                                 this.hide();
                         }
                 };

_source/core/resourcemanager.js

@@ -127 +127 @@
                 var external = this.externals[ name ];
                 return CKEDITOR.getUrl(
                                 this.getPath( name ) +
-                                ( ( external && external.file ) || ( this.fileName + '.js' ) ) );
+                                // External file name could be an empty one,
+                                // which indicate dir is already of the full path.
+                                ( external ? external.file : this.fileName + '.js' ) );
         },
 
         /**