Ticket #7839: 7839.patch

_source/plugins/pastefromword/filter/default.js

@@ -279 +279 @@
                                                                                 var listId = Number( val[ 0 ].match( /\d+/ ) ),
                                                                                         indent = Number( val[ 1 ].match( /\d+/ ) );
 
-                                                                                listId !== previousListId && ( attrs[ 'cke:reset' ] = 1 );
-                                                                                previousListId = listId;
+                                                                                if ( indent == 1 )
+                                                                                {
+                                                                                        listId !== previousListId && ( attrs[ 'cke:reset' ] = 1 );
+                                                                                        previousListId = listId;
+                                                                                }
                                                                                 attrs[ 'cke:indent' ] = indent;
                                                                         } ]
                                                                 ] )( attrs.style, element ) || '';
@@ -357 +360 @@
                                 // E.g. <ul><li>level1<ol><li>level2</li></ol></li> =>
                                 // <cke:li cke:listtype="ul" cke:indent="1">level1</cke:li>
                                 // <cke:li cke:listtype="ol" cke:indent="2">level2</cke:li>
-                                flattenList : function( element )
+                                flattenList : function( element, level )
                                 {
+                                        level = typeof level == 'number' ? level : 1;
+
                                         var     attrs = element.attributes,
-                                                parent = element.parent;
+                                                listStyleType;
 
-                                        var listStyleType,
-                                                indentLevel = 1;
-
-                                        // Resolve how many level nested.
-                                        while ( parent )
-                                        {
-                                                parent.attributes && parent.attributes[ 'cke:list' ] && indentLevel++;
-                                                parent = parent.parent;
-                                        }
-
                                         // All list items are of the same type.
                                         switch ( attrs.type )
                                         {
                                                 case 'a' :
                                                         listStyleType = 'lower-alpha';
                                                         break;
+                                                case '1' :
+                                                        listStyleType = 'decimal';
+                                                        break;
                                                 // TODO: Support more list style type from MS-Word.
                                         }
 
                                         var children = element.children,
-                                                child;
+                                                child,
+                                                index;
 
                                         for ( var i = 0; i < children.length; i++ )
                                         {
                                                 child = children[ i ];
-                                                var attributes = child.attributes;
+                                                if ( child.name == 'li' )
+                                                {
+                                                        var attributes = child.attributes;
 
-                                                if ( child.name in CKEDITOR.dtd.$listItem )
-                                                {
-                                                        var listItemChildren = child.children,
-                                                                count = listItemChildren.length,
-                                                                last = listItemChildren[ count - 1 ];
+                                                        if ( child.name in CKEDITOR.dtd.$listItem )
+                                                        {
+                                                                var listItemChildren = child.children,
+                                                                        count = listItemChildren.length,
+                                                                        last = listItemChildren[ count - 1 ];
 
-                                                        // Move out nested list.
-                                                        if ( last.name in CKEDITOR.dtd.$list )
-                                                        {
-                                                                children.splice( i + 1, 0, last );
-                                                                last.parent = element;
+                                                                // Move out nested list.
+                                                                if ( last.name in CKEDITOR.dtd.$list )
+                                                                {
+                                                                        children.splice( i + 1, 0, last );
+                                                                        last.parent = element;
 
-                                                                // Remove the parent list item if it's just a holder.
-                                                                if ( !--listItemChildren.length )
-                                                                        children.splice( i, 1 );
-                                                        }
+                                                                        // Remove the parent list item if it's just a holder.
+                                                                        if ( !--listItemChildren.length )
+                                                                                children.splice( i, 1 );
+
+                                                                        // Flatten sub list.
+                                                                        arguments.callee.apply( this, [ last, level + 1 ] );
+                                                                        var index = children.indexOf( last );
+                                                                        // Absorb sub list children.
+                                                                        children = children.splice( 0, index ).concat( last.children ).concat( children.splice( index + 1 ) );
+                                                                        element.children = children;
+                                                                }
 
-                                                        child.name = 'cke:li';
+                                                                child.name = 'cke:li';
 
-                                                        // Inherit numbering from list root on the first list item.
-                                                        attrs.start && !i && ( attributes.value = attrs.start );
+                                                                // Inherit numbering from list root on the first list item.
+                                                                attrs.start && !i && ( attributes.value = attrs.start );
 
-                                                        plugin.filters.stylesFilter(
-                                                                [
-                                                                    [ 'tab-stops', null, function( val )
-                                                                        {
-                                                                                var margin = val.split( ' ' )[ 1 ].match( cssLengthRelativeUnit );
-                                                                                margin && ( previousListItemMargin = parseInt( plugin.utils.convertToPx( margin[ 0 ] ), 10 ) );
-                                                                        } ],
-                                                                        [ 'mso-list', null, function( val )
-                                                                        {
-                                                                                val = val.split( ' ' );
-                                                                                var listId = Number( val[ 0 ].match( /\d+/ ) );
-                                                                                listId !== previousListId && ( attributes[ 'cke:reset' ] = 1 );
-                                                                                previousListId = listId;
-                                                                        } ]
-                                                                ] )( attributes.style );
+                                                                plugin.filters.stylesFilter(
+                                                                        [
+                                                                                [ 'tab-stops', null, function( val )
+                                                                                {
+                                                                                        var margin = val.split( ' ' )[ 1 ].match( cssLengthRelativeUnit );
+                                                                                        margin && ( previousListItemMargin = parseInt( plugin.utils.convertToPx( margin[ 0 ] ), 10 ) );
+                                                                                } ],
+                                                                                ( level == 1 ? [ 'mso-list', null, function( val )
+                                                                                {
+                                                                                        val = val.split( ' ' );
+                                                                                        var listId = Number( val[ 0 ].match( /\d+/ ) );
+                                                                                        listId !== previousListId && ( attributes[ 'cke:reset' ] = 1 );
+                                                                                        previousListId = listId;
+                                                                                 } ] : null )
+                                                                        ] )( attributes.style );
 
-                                                        attributes[ 'cke:indent' ] = indentLevel;
-                                                        attributes[ 'cke:listtype' ] = element.name;
-                                                        attributes[ 'cke:list-style-type' ] = listStyleType;
-                                                }
-                                        }
+                                                                attributes[ 'cke:indent' ] = level;
+                                                                attributes[ 'cke:listtype' ] = element.name;
+                                                                attributes[ 'cke:list-style-type' ] = listStyleType;
+                                                        }
+                                                }
+                                        }
 
                                         delete element.name;