Ticket #6662: 6662_5.patch

_source/plugins/pastefromword/filter/default.js

@@ -228 +228 @@
                                                                                 margin = parseInt( margin, 10 );
 
                                                                                 // Figure out the indent unit by looking at the first increament.
-                                                                                if ( !listBaseIndent && previousListItemMargin && margin > previousListItemMargin )
+                                                                                if ( !listBaseIndent && previousListItemMargin != undefined && margin > previousListItemMargin )
                                                                                         listBaseIndent = margin - previousListItemMargin;
 
                                                                                 attrs[ 'cke:margin' ] = previousListItemMargin = margin;
@@ -236 +236 @@
                                                         ] )( attrs.style, element ) || '' ;
                                         }
 
+                                        // First level list item are always presented without a margin.
+                                        !attrs[ 'cke:margin' ] && ( attrs[ 'cke:margin' ] = previousListItemMargin = 0 );
+
                                         // Inherit list-type-style from bullet.
                                         var listBulletAttrs = listMarker.attributes,
                                                 listBulletStyle = listBulletAttrs.style;
@@ -392 +395 @@
                                                         // been resolved from a pseudo list item's margin value, even get
                                                         // no indentation at all.
                                                         listItemIndent = parseInt( listItemAttrs[ 'cke:indent' ], 10 )
-                                                                                                        || listBaseIndent && ( Math.ceil( listItemAttrs[ 'cke:margin' ] / listBaseIndent ) )
+                                                                                                        || listBaseIndent && ( Math.ceil( listItemAttrs[ 'cke:margin' ] / listBaseIndent ) + 1 )
                                                                                                         || 1;
 
                                                         // Ignore the 'list-style-type' attribute if it's matched with
@@ -755 +758 @@
 
                                         'p' : function( element )
                                         {
+                                                // This's a fall-back approach to recognize list item in FF3.6,
+                                                // as it's not perfect as not all list style (e.g. "heading list") is shipped
+                                                // with this pattern. (#6662)
+                                                if ( /MsoListParagraph/.exec( element.attributes[ 'class' ] ) )
+                                                {
+                                                        var bulletText = element.firstChild( function( node ) { return node.type == CKEDITOR.NODE_TEXT; } );
+                                                        var bullet = bulletText && bulletText.parent,
+                                                                bulletAttrs = bullet && bullet.attributes;
+                                                        bulletAttrs && !bulletAttrs.style && ( bulletAttrs.style = 'mso-list: Ignore;' );
+                                                }
+
                                                 element.filterChildren();
 
                                                 // Is the paragraph actually a list item?
@@ -1115 +1129 @@
                 // Allow extending data filter rules.
                 editor.fire( 'beforeCleanWord', { filter : dataFilter } );
 
+                data = dataProcessor.toHtml( data, false );
                 try
                 {
-                        data = dataProcessor.toHtml( data, false );
                 }
                 catch ( e )
                 {