Ticket #6305: 6305.patch

_source/plugins/liststyle/dialogs/liststyle.js

@@ -1 @@
-/*
+/*
  * Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.html or http://ckeditor.com/license
  */
 
 (function()
 {
-        function getListElement( editor, listTag )
-        {
-                var range;
-                try { range  = editor.getSelection().getRanges()[ 0 ]; }
-                catch( e ) { return null; }
-
-                range.shrink( CKEDITOR.SHRINK_TEXT );
-                return range.getCommonAncestor().getAscendant( listTag, 1 );
-        }
-
         var mapListStyle = {
                 'a' : 'lower-alpha',
                 'A' : 'upper-alpha',
@@ -78 +68 @@
                                 onShow: function()
                                 {
                                         var editor = this.getParentEditor(),
-                                                element = getListElement( editor, 'ul' );
+                                                element = CKEDITOR.plugins.liststyle.getSelectedList( editor, 'ul' );
 
                                         element && this.setupContent( element );
                                 },
                                 onOk: function()
                                 {
                                         var editor = this.getParentEditor(),
-                                                element = getListElement( editor, 'ul' );
+                                                element = CKEDITOR.plugins.liststyle.getSelectedList( editor, 'ul' );
 
                                         element && this.commitContent( element );
                                 }
@@ -177 +167 @@
                                 onShow: function()
                                 {
                                         var editor = this.getParentEditor(),
-                                                element = getListElement( editor, 'ol' );
+                                                element = CKEDITOR.plugins.liststyle.getSelectedList( editor, 'ol' );
 
                                         element && this.setupContent( element );
                                 },
                                 onOk: function()
                                 {
                                         var editor = this.getParentEditor(),
-                                                element = getListElement( editor, 'ol' );
+                                                element = CKEDITOR.plugins.liststyle.getSelectedList( editor, 'ol' );
 
                                         element && this.commitContent( element );
                                 }

_source/plugins/liststyle/plugin.js

@@ -43 +43 @@
                         {
                                 editor.contextMenu.addListener( function( element, selection )
                                         {
-                                                if ( !element || element.isReadOnly() )
-                                                        return null;
-
-                                                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;
-                                        });
-                        }
-                }
+                                                return CKEDITOR.plugins.liststyle.getSelectedList( editor, 'ol' ) ? { numberedlist: CKEDITOR.TRISTATE_OFF } :
+                                                           CKEDITOR.plugins.liststyle.getSelectedList( editor, 'ul' ) ? { bulletedlist: CKEDITOR.TRISTATE_OFF } : null;
+                                        });
+                        }
+                },
+                getSelectedList :        function( editor, listTag )
+                {
+                        try
+                        {
+                                var selection = editor.getSelection(),
+                                                start= selection.getStartElement(),
+                                                range = selection.getRanges()[ 0 ];
+                        }
+                        catch( e ) { return null; }
+
+                        if ( !start || start.isReadOnly() )
+                                return null;
+
+                        range.shrink( CKEDITOR.SHRINK_TEXT );
+                        return range.getCommonAncestor().getAscendant( listTag, 1 );
+                }
         };
 
         CKEDITOR.plugins.add( 'liststyle', CKEDITOR.plugins.liststyle );