Ticket #5292: 5292_2.patch

_source/plugins/font/plugin.js

@@ -29 +29 @@
                                 vars[ styleType ] = values[ i ] = parts[ 1 ] || name;
 
                                 styles[ name ] = new CKEDITOR.style( styleDefinition, vars );
+                                styles[ name ]._.definition.name = name;
                         }
                         else
                                 names.splice( i--, 1 );
@@ -55 +56 @@
                                                 var name = names[ i ];
 
                                                 // Add the tag entry to the panel list.
-                                                this.add( name, '<span style="font-' + styleType + ':' + values[ i ] + '">' + name + '</span>', name );
+                                                this.add( name, styles[ name ].buildPreview(), name );
                                         }
                                 },
 

_source/plugins/styles/plugin.js

@@ -298 +298 @@
                                 }
                         }
                         return false;
+                },
+
+                // Builds the preview HTML based on the styles definition.
+                buildPreview : function()
+                {
+                        var styleDefinition = this._.definition,
+                                html = [],
+                                elementName = styleDefinition.element;
+
+                        // Avoid <bdo> in the preview.
+                        if ( elementName == 'bdo' )
+                                elementName = 'span';
+
+                        html = [ '<', elementName ];
+
+                        // Assign all defined attributes.
+                        var attribs     = styleDefinition.attributes;
+                        if ( attribs )
+                        {
+                                for ( var att in attribs )
+                                {
+                                        html.push( ' ', att, '="', attribs[ att ], '"' );
+                                }
+                        }
+
+                        // Assign the style attribute.
+                        var cssStyle = CKEDITOR.style.getStyleText( styleDefinition );
+                        if ( cssStyle )
+                                html.push( ' style="', cssStyle, '"' );
+
+                        html.push( '>', styleDefinition.name, '</', elementName, '>' );
+
+                        return html.join( '' );
                 }
         };
 
@@ -1234 +1267 @@
                 temp [ isStyle ? 'setStyle' : 'setAttribute' ]( name, value );
                 return temp[ isStyle ? 'getStyle' : 'getAttribute' ]( name );
         }
-        
+
         function normalizeCssText( unparsedCssText, nativeNormalize )
         {
                 var styleText;

_source/plugins/stylescombo/plugin.js

@@ -85 +85 @@
 
                                                                         combo.add(
                                                                                 styleName,
-                                                                                style.type == CKEDITOR.STYLE_OBJECT ? styleName : buildPreview( style._.definition ),
+                                                                                style.type == CKEDITOR.STYLE_OBJECT ? styleName : style.buildPreview(),
                                                                                 styleName );
                                                                 }
 
@@ -190 +190 @@
                 }
         });
 
-        function buildPreview( styleDefinition )
-        {
-                var html = [];
-
-                var elementName = styleDefinition.element;
-
-                // Avoid <bdo> in the preview.
-                if ( elementName == 'bdo' )
-                        elementName = 'span';
-
-                html = [ '<', elementName ];
-
-                // Assign all defined attributes.
-                var attribs     = styleDefinition.attributes;
-                if ( attribs )
-                {
-                        for ( var att in attribs )
-                        {
-                                html.push( ' ', att, '="', attribs[ att ], '"' );
-                        }
-                }
-
-                // Assign the style attribute.
-                var cssStyle = CKEDITOR.style.getStyleText( styleDefinition );
-                if ( cssStyle )
-                        html.push( ' style="', cssStyle, '"' );
-
-                html.push( '>', styleDefinition.name, '</', elementName, '>' );
-
-                return html.join( '' );
-        }
-
         function sortStyles( styleA, styleB )
         {
                 var typeA = styleA.type,