Ticket #6934: 6934.patch

_source/plugins/styles/plugin.js

@@ -295 +295 @@
                 buildPreview : function()
                 {
                         var styleDefinition = this._.definition,
-                                html = [],
-                                elementName = styleDefinition.element;
+                                html = styleDefinition.displayHtml;
 
-                        // Avoid <bdo> in the preview.
-                        if ( elementName == 'bdo' )
-                                elementName = 'span';
+                        if ( !html )
+                        {
+                                html = [];
+                                var elementName = styleDefinition.element;
+
+                                // Avoid <bdo> in the preview.
+                                if ( elementName == 'bdo' )
+                                        elementName = 'span';
 
-                        html = [ '<', elementName ];
+                                html = [ '<', elementName ];
 
-                        // Assign all defined attributes.
-                        var attribs     = styleDefinition.attributes;
-                        if ( attribs )
-                        {
-                                for ( var att in attribs )
-                                {
-                                        html.push( ' ', att, '="', attribs[ att ], '"' );
-                                }
-                        }
+                                // 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, '"' );
+                                // Assign the style attribute.
+                                var cssStyle = CKEDITOR.style.getStyleText( styleDefinition );
+                                if ( cssStyle )
+                                        html.push( ' style="', cssStyle, '"' );
 
-                        html.push( '>', styleDefinition.name, '</', elementName, '>' );
+                                html.push( '>', styleDefinition.name, '</', elementName, '>' );
 
-                        return html.join( '' );
-                }
+                                html = html.join( '' );
+                        }
+
+                        return html;
+                }
         };
 
         // Build the cssText based on the styles definition.
@@ -367 +374 @@
 
         // Gets the parent element which blocks the styling for an element. This
         // can be done through read-only elements (contenteditable=false) or
-        // elements with the "data-cke-nostyle" attribute.
+        // elements with the "data-nostyle" attribute.
         function getUnstylableParent( element )
         {
                 var unstylable,
@@ -378 +385 @@
                         if ( element.getName() == 'body' )
                                 break;
 
-                        if ( element.getAttribute( 'data-cke-nostyle' ) )
+                        if ( element.getAttribute( 'data-nostyle' ) )
                                 unstylable = element;
                         else if ( !editable )
                         {
@@ -473 +480 @@
                                 var nodeType = currentNode.type;
                                 var nodeName = nodeType == CKEDITOR.NODE_ELEMENT ? currentNode.getName() : null;
                                 var nodeIsReadonly = nodeName && ( currentNode.getAttribute( 'contentEditable' ) == 'false' );
-                                var nodeIsNoStyle = nodeName && currentNode.getAttribute( 'data-cke-nostyle' );
+                                var nodeIsNoStyle = nodeName && currentNode.getAttribute( 'data-nostyle' );
 
                                 if ( nodeName && currentNode.data( 'cke-bookmark' ) )
                                 {