Changeset 3929

Timestamp:

07/17/09 16:09:03 (4 years ago)

Author:

garry.yao

Message:

Fixing #3959: Pasting styled text from MS-Word cause content loss.

Location:

CKEditor/trunk

Files:

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

CKEditor/trunk/CHANGES.html

@@ -149 +149 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3972">#3972</a> : Fixed unable to remove a single empty list in document in Firefox with enterMode=BR.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3973">#3973</a> : Fixed list creation error at the end of document.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3959">#3959</a> : Pasting styled text from word result in content lost.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3793">#3793</a> : Combined images into sprites.</li>
         </ul>

CKEditor/trunk/_source/plugins/pastefromword/dialogs/pastefromword.js

@@ -30 +30 @@
                 cleanWord : function( editor, html, ignoreFont, removeStyles )
                 {
+                        // Remove comments [SF BUG-1481861].
+                        html = html.replace(/<\!--[\s\S]*?-->/g, '' ) ;
+
                         html = html.replace(/<o:p>\s*<\/o:p>/g, '') ;
                         html = html.replace(/<o:p>[\s\S]*?<\/o:p>/g, '&nbsp;') ;
@@ -94 +97 @@
                         // Remove Tags with XML namespace declarations: <o:p><\/o:p>
                         html = html.replace(/<\/?\w+:[^>]*>/gi, '' ) ;
-
-                        // Remove comments [SF BUG-1481861].
-                        html = html.replace(/<\!--[\s\S]*?-->/g, '' ) ;
 
                         html = html.replace( /<(U|I|STRIKE)>&nbsp;<\/\1>/g, '&nbsp;' ) ;