Ticket #536: 536.patch

_source/plugins/stylescombo/plugin.js

@@ -109 +109 @@
                                                 var style = styles[ value ],
                                                         selection = editor.getSelection();
 
-                                                if ( style.type == CKEDITOR.STYLE_OBJECT )
-                                                {
-                                                        var element = selection.getSelectedElement();
-                                                        if ( element )
-                                                                style.applyToObject( element );
-
-                                                        return;
-                                                }
-
                                                 var elementPath = new CKEDITOR.dom.elementPath( selection.getStartElement() );
 
                                                 if ( style.type == CKEDITOR.STYLE_INLINE && style.checkActive( elementPath ) )
@@ -169 +160 @@
                                                 var selection = editor.getSelection();
 
                                                 var element = selection.getSelectedElement(),
-                                                        elementName = element && element.getName(),
                                                         elementPath = new CKEDITOR.dom.elementPath( element || selection.getStartElement() );
 
                                                 var counter = [ 0, 0, 0, 0 ];
@@ -180 +170 @@
                                                         var style = styles[ name ],
                                                                 type = style.type;
 
-                                                        if ( type == CKEDITOR.STYLE_OBJECT )
-                                                        {
-                                                                if ( element && style.element == elementName )
-                                                                {
-                                                                        if ( style.checkElementRemovable( element, true ) )
-                                                                                this.mark( name );
-
-                                                                        counter[ type ]++;
-                                                                }
-                                                                else
-                                                                        this.hideItem( name );
+                                                        if ( style.checkActive( elementPath ) )
+                                                                this.mark( name );
+                                                        else if ( type == CKEDITOR.STYLE_OBJECT && !style.checkApplicable( elementPath ) )
+                                                        {
+                                                                this.hideItem( name );
+                                                                counter[ type ]--;
                                                         }
-                                                        else
-                                                        {
-                                                                if ( style.checkActive( elementPath ) )
-                                                                        this.mark( name );
 
-                                                                counter[ type ]++;
-                                                        }
-                                                }
+                                                        counter[ type ]++;
+                                                }
 
                                                 if ( !counter[ CKEDITOR.STYLE_BLOCK ] )
                                                         this.hideGroup( lang[ 'panelTitle' + String( CKEDITOR.STYLE_BLOCK ) ] );

_source/plugins/styles/plugin.js

@@ -127 +127 @@
                                                         applyInlineStyle
                                                 : this.type == CKEDITOR.STYLE_BLOCK ?
                                                         applyBlockStyle
+                                                : this.type == CKEDITOR.STYLE_OBJECT ?
+                                                        applyObjectStyle
                                                 : null ).call( this, range );
                 },
 
@@ -154 +156 @@
                                 case CKEDITOR.STYLE_BLOCK :
                                         return this.checkElementRemovable( elementPath.block || elementPath.blockLimit, true );
 
+                                case CKEDITOR.STYLE_OBJECT :
                                 case CKEDITOR.STYLE_INLINE :
 
                                         var elements = elementPath.elements;
 
                                         for ( var i = 0, element ; i < elements.length ; i++ )
                                         {
-                                                element = elements[i];
+                                                element = elements[ i ];
 
-                                                if ( element == elementPath.block || element == elementPath.blockLimit )
+                                                if ( this.type == CKEDITOR.STYLE_INLINE
+                                                          && ( element == elementPath.block || element == elementPath.blockLimit ) )
                                                         continue;
 
+                                                if( this.type == CKEDITOR.STYLE_OBJECT
+                                                         && !( element.getName() in objectElements ) )
+                                                                continue;
+
                                                 if ( this.checkElementRemovable( element, true ) )
                                                         return true;
                                         }
                         }
                         return false;
                 },
-
+                
+                checkApplicable : function( elementPath )
+                {
+                        switch ( this.type )
+                        {
+                                case CKEDITOR.STYLE_INLINE :
+                                case CKEDITOR.STYLE_BLOCK :
+                                        return true;
+
+                                case CKEDITOR.STYLE_OBJECT :
+                                        return elementPath.lastElement.getAscendant( this.element, true );
+                        }
+                },
+
                 // Checks if an element, or any of its attributes, is removable by the
                 // current style definition.
                 checkElementRemovable : function( element, fullMatch )
@@ -668 +689 @@
                 range.moveToBookmark( bookmark );
 }
 
+        function applyObjectStyle( range )
+        {
+                var root = range.getCommonAncestor( true, true ),
+                                element = root.getAscendant( this.element, true );
+                element && setupElement( element, this );
+        }
+
         function applyBlockStyle( range )
         {
                 // Serializible bookmarks is needed here since

_source/plugins/stylescombo/styles/default.js

@@ -81 +81 @@
                         'border' : '2',
                         'align' : 'right'
                 }
-        }
+        },
+
+        { name : 'Borderless Table'             , element : 'table', styles: { 'border-style': 'hidden', 'background-color' : '#E6E6FA' } },
+        { name : 'Square Bulleted List'         , element : 'ul', styles : { 'list-style-type' : 'square' } }
+
 ]);