Changeset 3494

Timestamp:

05/12/09 13:40:13 (4 years ago)

Author:

garry.yao

Message:

Fix #3092: Combo style list emtpy when selecting block element.

File:

• CKEditor/trunk/_source/plugins/stylescombo/plugin.js (modified) (2 diffs)

CKEditor/trunk/_source/plugins/stylescombo/plugin.js

@@ -158 +158 @@
                                                 var selection = editor.getSelection();
 
-                                                var elementPath,
-                                                        element = selection.getSelectedElement(),
+                                                var element = selection.getSelectedElement(),
                                                         elementName = element && element.getName(),
-                                                        isInline = elementName &&
-                                                                !CKEDITOR.dtd.$block[ elementName ] &&
-                                                                !CKEDITOR.dtd.$listItem[ elementName ] &&
-                                                                !CKEDITOR.dtd.$tableContent[ elementName ];
+                                                        elementPath = new CKEDITOR.dom.elementPath( element || selection.getStartElement() );
 
                                                 var counter = [ 0, 0, 0, 0 ];
-
-                                                if ( !element || isInline )
-                                                        elementPath = new CKEDITOR.dom.elementPath( selection.getStartElement() );
-
                                                 this.showAll();
                                                 this.unmarkAll();
-
                                                 for ( var name in styles )
                                                 {
@@ -193 +184 @@
                                                         else
                                                         {
-                                                                if ( elementPath )
-                                                                {
-                                                                        if ( style.checkActive( elementPath ) )
-                                                                                this.mark( name );
-
-                                                                        counter[ type ]++;
-
-                                                                }
-                                                                else
-                                                                        this.hideItem( name );
+                                                                if ( style.checkActive( elementPath ) )
+                                                                        this.mark( name );
+
+                                                                counter[ type ]++;
                                                         }
                                                 }