Ticket #9063: 9063.patch

_source/plugins/indent/plugin.js

@@ -139 +139 @@
                                 // Apply indenting or outdenting on the array.
                                 var baseIndent = listArray[ lastItem.getCustomData( 'listarray_index' ) ].indent;
                                 for ( i = startItem.getCustomData( 'listarray_index' ); i <= lastItem.getCustomData( 'listarray_index' ); i++ )
-                                {
                                         listArray[ i ].indent += indentOffset;
-                                        // Make sure the newly created sublist get a brand-new element of the same type. (#5372)
-                                        var listRoot = listArray[ i ].parent;
-                                        listArray[ i ].parent = new CKEDITOR.dom.element( listRoot.getName(), listRoot.getDocument() );
-                                }
 
                                 for ( i = lastItem.getCustomData( 'listarray_index' ) + 1 ;
                                                 i < listArray.length && listArray[i].indent > baseIndent ; i++ )

_source/plugins/list/plugin.js

@@ -31 +31 @@
                 }
         }
 
+        // Inheirt inline styles from another element.
+        function inheirtInlineStyles( parent, el )
+        {
+                var style = parent.getAttribute( 'style' );
+
+                // Put parent styles before child styles.
+                style && el.setAttribute( 'style',
+                        style.replace( /([^;])$/, '$1;' ) +
+                        ( el.getAttribute( 'style' ) || '' ) );
+        }
+
         CKEDITOR.plugins.list = {
                 /*
                  * Convert a DOM list tree into a data structure that is easier to
@@ -108 +119 @@
                                 paragraphName = ( paragraphMode == CKEDITOR.ENTER_P ? 'p' : 'div' );
                         while ( 1 )
                         {
-                                var item = listArray[ currentIndex ];
+                                var item = listArray[ currentIndex ],
+                                        itemParent = item.parent;
 
                                 orgDir = item.element.getDirection( 1 );
 
@@ -116 +128 @@
                                 {
                                         if ( !rootNode || listArray[ currentIndex ].parent.getName() != rootNode.getName() )
                                         {
-                                                rootNode = listArray[ currentIndex ].parent.clone( false, 1 );
+                                                // Make sure the newly created sub list NOT inheriting styles from parent. (#5372)
+                                                rootNode = baseIndex ? doc.createElement( itemParent.getName() ) : itemParent.clone( false, 1 );
                                                 dir && rootNode.setAttribute( 'dir', dir );
                                                 retval.append( rootNode );
                                         }
@@ -146 +159 @@
                                 }
                                 else if ( item.indent == -1 && !baseIndex && item.grandparent )
                                 {
+                                        // We're leaving this parent list, inherit it's inline styles.
+                                        var listNode = itemParent.clone();
+                                        if ( listNode.hasAttribute( 'style' ) )
+                                        {
+                                                listNode.removeStyle( 'list-style-type' );
+                                                inheirtInlineStyles( listNode, item.element );
+                                        }
+
                                         if ( listNodeNames[ item.grandparent.getName() ] )
                                                 currentListItem = item.element.clone( false, true );
                                         else
@@ -171 +192 @@
                                                         if ( dirLoose && !child.getDirection() )
                                                                 child.setAttribute( 'dir', orgDir );
 
-                                                        // Merge into child styles.
-                                                        style && child.setAttribute( 'style',
-                                                                                 style.replace( /([^;])$/, '$1;') +
-                                                                                 ( child.getAttribute( 'style' ) || '' ) );
+                                                        inheirtInlineStyles( li, child );
 
                                                         className && child.addClass( className );
                                                 }