Changeset 5777

Timestamp:

08/02/10 01:49:10 (3 years ago)

Author:

fredck

Message:

#6073 : The list context menu was showing the wrong option when in a mixed list hierarchy.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/liststyle/plugin.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -99 +99 @@
                 <li><a href="http://dev.fckeditor.net/ticket/6059">#6059</a> : Changing list type didn't preserve the list's attributes.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/5193">#5193</a> : In Firefox, the element path options had the text cursor instead of the arrow.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/6073">#6073</a> : The list context menu was showing the wrong option when in a mixed list hierarchy.</li>
                 <li>Updated the following language files:<ul>
                         <li>Chinese Simplified;</li>

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

@@ -44 +44 @@
                                 editor.contextMenu.addListener( function( element, selection )
                                         {
-                                                if ( !element )
-                                                        return null;
-
-                                                if ( element.getAscendant( 'ol') )
-                                                        return { numberedlist: CKEDITOR.TRISTATE_OFF };
-
-                                                if ( element.getAscendant( 'ul' ) )
-                                                        return { bulletedlist: CKEDITOR.TRISTATE_OFF };
+                                                while ( element )
+                                                {
+                                                        var name = element.getName();
+                                                        if ( name == 'ol' )
+                                                                return { numberedlist: CKEDITOR.TRISTATE_OFF };
+                                                        else if ( name == 'ul' )
+                                                                return { bulletedlist: CKEDITOR.TRISTATE_OFF };
+        
+                                                        element = element.getParent();
+                                                }
+                                                return null;
                                         });
                         }