Ticket #6662: 6662_2.patch

_source/plugins/pastefromword/filter/default.js

@@ -184 +184 @@
                         isListBulletIndicator : function( element )
                         {
                                 var styleText = element.attributes && element.attributes.style;
-                                if ( /mso-list\s*:\s*Ignore/i.test( styleText ) )
+                                if ( !CKEDITOR.env.gecko && /mso-list\s*:\s*Ignore/i.test( styleText ) )
                                         return true;
+                                // Search for following structure in Gecko `P.class > SPAN > SPAN > SPAN`.
+                                else if ( CKEDITOR.env.gecko && element.parent.attributes && 
+                                        /\b(ListParagraph(CxSp\w+)?|MsoNormal\b)/i.test( element.parent.attributes[ 'class' ] ) &&
+                                        element.children && element.children.length == 1 && element.children[ 0 ].name == 'span' &&
+                                        element.children[ 0 ].children && element.children[ 0 ].children.length == 1 &&
+                                        element.children[ 0 ].children[ 0 ].type == 3
+                                )
+                                        return true;
                         },
 
                         isContainingOnlySpaces : function( element )
@@ -214 +222 @@
                                                                         // Text-indent is not representing list item level any more.
                                                                         [ 'text-indent' ],
                                                                         [ 'line-height' ],
+
+                                                                        [ 'list-style-type' ],
                                                                         // Resolve indent level from 'margin-left' value.
                                                                         [ ( /^margin(:?-left)?$/ ), null, function( margin )
                                                                         {
@@ -370 +380 @@
                                                         listItemIndent, // Indent level of current list item.
                                                         lastListItem, // The previous one just been added to the list.
                                                         list, parentList, // Current staging list and it's parent list if any.
-                                                        indent;
+                                                        indent, diff;
 
                                         for ( var i = 0; i < children.length; i++ )
                                         {
@@ -399 +409 @@
                                                                         ] )( listItemAttrs.style )
                                                                         || '' );
 
-                                                        if ( !list )
+                                                        if ( !list || ( list && list.name != listType ) )
                                                         {
                                                                 list = new CKEDITOR.htmlParser.element( listType );
                                                                 list.add( listItem );
+                                                                list._indent = listItemIndent;
                                                                 children[ i ] = list;
+                                                                
+                                                                if ( listItemIndent > indent )
+                                                                        lastListItem.add( list );
                                                         }
                                                         else
                                                         {
                                                                 if ( listItemIndent > indent )
                                                                 {
-                                                                        list = new CKEDITOR.htmlParser.element( listType );
-                                                                        list.add( listItem );
-                                                                        lastListItem.add( list );
-                                                                }
+                                                                        diff = listItemIndent - indent;
+
+                                                                        while ( diff-- )
+                                                                        {
+                                                                                list = new CKEDITOR.htmlParser.element( listType );
+                                                                                lastListItem.add( list );
+                                                                                list._indent = listItemIndent - diff;
+                                                                                
+                                                                                if ( diff > 0 )
+                                                                                {
+                                                                                        list.add( new CKEDITOR.htmlParser.element( 'li' ) );
+                                                                                        lastListItem = list.children[ 0 ];
+                                                                                }
+                                                                                else
+                                                                                        list.add( listItem );
+                                                                        }
+                                                                }
+                                                                // TODO support a list type change here
                                                                 else if ( listItemIndent < indent )
                                                                 {
                                                                         // There might be a negative gap between two list levels. (#4944)
-                                                                        var diff = indent - listItemIndent,
-                                                                                parent;
-                                                                        while ( diff-- && ( parent = list.parent ) )
-                                                                                list = parent.parent;
+                                                                        parentList = list.parent && list.parent.parent,
+                                                                                diff = ( parentList && listItemIndent == parentList._indent ) ? 1 : indent - listItemIndent;
 
+                                                                        while ( diff-- && list.parent && ( parentList = list.parent.parent ) )
+                                                                        {
+                                                                                list = parentList;
+                                                                        }
+
                                                                         list.add( listItem );
                                                                 }
                                                                 else
@@ -867 +898 @@
 
                                                 // For IE/Safari: List item bullet type is supposed to be indicated by
                                                 // the text of a span with style 'mso-list : Ignore' or an image.
-                                                if ( !CKEDITOR.env.gecko && isListBulletIndicator( element ) )
+                                                // For Gecko, list bullet is a child of `p.ListParagraphCxSp*` element.
+                                                if ( ( !CKEDITOR.env.gecko && isListBulletIndicator( element ) ) ||
+                                                        ( CKEDITOR.env.gecko && isListBulletIndicator( element ) ) )
                                                 {
-                                                        var listSymbolNode = element.firstChild( function( node )
-                                                        {
-                                                                return node.value || node.name == 'img';
-                                                        });
-
-                                                        var listSymbol =  listSymbolNode && ( listSymbolNode.value || 'l.' ),
-                                                                listType = listSymbol.match( /^([^\s]+?)([.)]?)$/ );
+                                                        var listSymbol, listType;
+                                                        if ( CKEDITOR.env.gecko )
+                                                        {
+                                                                listType = element.children[ 0 ].children[ 0 ].value;
+                                                                listType = /^(?:&nbsp;[ \n]?)*([\w\u00B7]*)(\.?)/.exec( listType );
+                                                        }
+                                                        else
+                                                        {
+                                                                var listSymbolNode = element.firstChild( function( node )
+                                                                {
+                                                                        return node.value || node.name == 'img';
+                                                                });
+                                                                
+                                                                listSymbol =  listSymbolNode && ( listSymbolNode.value || 'l.' ),
+                                                                        listType = listSymbol.match( /^([^\s]+?)([.)]?)$/ );
+                                                        }
                                                         return createListBulletMarker( listType, listSymbol );
                                                 }
 
@@ -971 +1013 @@
                                                 // Preserve clear float style.
                                                 [ ( /^clear$/ ) ],
 
+                                                [ ( /^list-style-type/ ) ],
+
                                                 [ ( /^border.*|margin.*|vertical-align|float$/ ), null,
                                                         function( value, element )
                                                         {