Changeset 4838

Timestamp:

12/29/09 15:16:37 (3 years ago)

Author:

garry.yao

Message:

#4892: Apply table align without text surrounding by first apply alignment attribute to the table element and following a div with clear float style.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/pastefromword/filter/default.js (modified) (2 diffs)

CKEditor/trunk/CHANGES.html

@@ -77 +77 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4905">#4905</a> : Fixed paste plain text result incorrect when content from dialog.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4889">#4889</a> : Fixed unable to undo 'New Page' command after typing inside editor.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/4892">#4892</a> : Fixed table alignment style is not properly represented by the wrapping div.</li>
         </ul>
         <h3>

CKEditor/trunk/_source/plugins/pastefromword/filter/default.js

@@ -766 +766 @@
                                         },
 
+                                        'div' : function( element )
+                                        {
+                                                // Aligned table with no text surrounded is represented by a wrapper div, from which
+                                                // table cells inherit as text-align styles, which is wrong.
+                                                // Instead we use a clear-float div after the table to properly achieve the same layout.
+                                                var singleChild = element.onlyChild();
+                                                if( singleChild && singleChild.name == 'table' )
+                                                {
+                                                        var attrs = element.attributes;
+                                                        singleChild.attributes = CKEDITOR.tools.extend( singleChild.attributes, attrs );
+                                                        attrs.style && singleChild.addStyle( attrs.style );
+
+                                                        var clearFloatDiv = new CKEDITOR.htmlParser.element( 'div' );
+                                                        clearFloatDiv.addStyle( 'clear' ,'both' );
+                                                        element.add( clearFloatDiv );
+                                                        delete element.name;
+                                                }
+                                        },
+
                                         'td' : function ( element )
                                         {
@@ -945 +964 @@
                                                                 }
                                                         } ],
+
+                                                // Preserve clear float style.
+                                                [ /^clear$/ ],
 
                                                 [ ( /^border.*|margin.*|vertical-align|float$/ ), null,