Ticket #9278: 9278.patch

_source/plugins/liststyle/dialogs/liststyle.js

@@ -25 +25 @@
                 '1' : 'decimal',
                 'disc' : 'disc',
                 'circle': 'circle',
-                'square' : 'square'
+                'square' : 'square',
+                'none' : 'none'
         };
 
         function listStyle( editor, startupPage )
@@ -55 +56 @@
                                                                         [ lang.notset, '' ],
                                                                         [ lang.circle, 'circle' ],
                                                                         [ lang.disc,  'disc' ],
-                                                                        [ lang.square, 'square' ]
+                                                                        [ lang.square, 'square' ],
+                                                                        [ lang.none, 'none' ]
                                                                 ],
                                                                 setup : function( element )
                                                                 {
@@ -104 +106 @@
                                 [ lang.upperRoman, 'upper-roman' ],
                                 [ lang.lowerAlpha, 'lower-alpha' ],
                                 [ lang.upperAlpha, 'upper-alpha' ],
-                                [ lang.decimal, 'decimal' ]
+                                [ lang.decimal, 'decimal' ],
+                                [ lang.none, 'none' ]
                         ];
 
                         if ( !CKEDITOR.env.ie || CKEDITOR.env.version > 7 )
@@ -140 +143 @@
                                                                                 validate : CKEDITOR.dialog.validate.integer( lang.validateStartNumber ),
                                                                                 setup : function( element )
                                                                                 {
-                                                                                        // List item start number dominates.
-                                                                                        var value = element.getFirst( listItem ).getAttribute( 'value' ) || element.getAttribute( 'start' ) || 1;
-                                                                                        value && this.setValue( value );
+                                                                                        var styleType = element.getStyle( 'list-style-type' )
+                                                                                                || mapListStyle[ element.getAttribute( 'type' ) ]
+                                                                                                || element.getAttribute( 'type' ) || '';
+                                                                                                
+                                                                                        if( styleType !== 'none')
+                                                                                        {
+                                                                                                // List item start number dominates.
+                                                                                                var value = element.getFirst( listItem ).getAttribute( 'value' ) || element.getAttribute( 'start' ) || 1;
+                                                                                                value && this.setValue( value );
+                                                                                        }
                                                                                 },
                                                                                 commit : function( element )
                                                                                 {
-                                                                                        var firstItem = element.getFirst( listItem );
-                                                                                        var oldStart = firstItem.getAttribute( 'value' ) || element.getAttribute( 'start' ) || 1;
+                                                                                        if(this.getDialog().getContentElement( 'info', 'type' ).getValue() === 'none')
+                                                                                        {
+                                                                                                if( element.getAttribute( 'start' ) )
+                                                                                                        element.removeAttribute( 'start' );
+                                                                                        } else
+                                                                                        {       
+                                                                                                var firstItem = element.getFirst( listItem );
+                                                                                                var oldStart = firstItem.getAttribute( 'value' ) || element.getAttribute( 'start' ) || 1;
 
-                                                                                        // Force start number on list root.
-                                                                                        element.getFirst( listItem ).removeAttribute( 'value' );
-                                                                                        var val = parseInt( this.getValue(), 10 );
-                                                                                        if ( isNaN( val ) )
-                                                                                                element.removeAttribute( 'start' );
-                                                                                        else
-                                                                                                element.setAttribute( 'start', val );
+                                                                                                // Force start number on list root.
+                                                                                                element.getFirst( listItem ).removeAttribute( 'value' );
+                                                                                                var val = parseInt( this.getValue(), 10 );
+                                                                                                if ( isNaN( val ) )
+                                                                                                        element.removeAttribute( 'start' );
+                                                                                                else
+                                                                                                        element.setAttribute( 'start', val );
 
-                                                                                        // Update consequent list item numbering.
-                                                                                        var nextItem = firstItem, conseq = oldStart, startNumber = isNaN( val ) ? 1 : val;
-                                                                                        while ( ( nextItem = nextItem.getNext( listItem ) ) && conseq++ )
-                                                                                        {
-                                                                                                if ( nextItem.getAttribute( 'value' ) == conseq )
-                                                                                                        nextItem.setAttribute( 'value', startNumber + conseq - oldStart );
-                                                                                        }
+                                                                                                // Update consequent list item numbering.
+                                                                                                var nextItem = firstItem, conseq = oldStart, startNumber = isNaN( val ) ? 1 : val;
+                                                                                                while ( ( nextItem = nextItem.getNext( listItem ) ) && conseq++ )
+                                                                                                {
+                                                                                                        if ( nextItem.getAttribute( 'value' ) == conseq )
+                                                                                                                nextItem.setAttribute( 'value', startNumber + conseq - oldStart );
+                                                                                                }
+                                                                                        }       
                                                                                 }
                                                                         },
                                                                         {
@@ -181 +198 @@
 
                                                                                         this.setValue( value );
                                                                                 },
+                                                                                onClick : function( value )
+                                                                                {                                                                                       
+                                                                                        var start = this.getDialog().getContentElement('info', 'start');
+                                                                                        if(this.getValue() === 'none')
+                                                                                        {                                                                                               
+                                                                                                if(start.isEnabled());
+                                                                                                        start.disable();                                                                                                                                                                                                                
+                                                                                        } else
+                                                                                        {                                                                                               
+                                                                                                if(!start.isEnabled()) 
+                                                                                                {
+                                                                                                        start.enable();         
+                                                                                                        if(!start.getValue())
+                                                                                                                start.setValue(1);
+                                                                                                }       
+                                                                                        }                                                                                       
+                                                                                },
                                                                                 commit : function( element )
                                                                                 {
                                                                                         var value = this.getValue();