Changeset 3929


Ignore:
Timestamp:
07/17/09 16:09:03 (6 years ago)
Author:
garry.yao
Message:

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

Location:
CKEditor/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CKEditor/trunk/CHANGES.html

    r3927 r3929  
    149149                <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>
    150150                <li><a href="http://dev.fckeditor.net/ticket/3973">#3973</a> : Fixed list creation error at the end of document.</li>
     151                <li><a href="http://dev.fckeditor.net/ticket/3959">#3959</a> : Pasting styled text from word result in content lost.</li>
    151152                <li><a href="http://dev.fckeditor.net/ticket/3793">#3793</a> : Combined images into sprites.</li>
    152153        </ul>
  • CKEditor/trunk/_source/plugins/pastefromword/dialogs/pastefromword.js

    r3919 r3929  
    3030                cleanWord : function( editor, html, ignoreFont, removeStyles )
    3131                {
     32                        // Remove comments [SF BUG-1481861].
     33                        html = html.replace(/<\!--[\s\S]*?-->/g, '' ) ;
     34
    3235                        html = html.replace(/<o:p>\s*<\/o:p>/g, '') ;
    3336                        html = html.replace(/<o:p>[\s\S]*?<\/o:p>/g, '&nbsp;') ;
     
    9497                        // Remove Tags with XML namespace declarations: <o:p><\/o:p>
    9598                        html = html.replace(/<\/?\w+:[^>]*>/gi, '' ) ;
    96 
    97                         // Remove comments [SF BUG-1481861].
    98                         html = html.replace(/<\!--[\s\S]*?-->/g, '' ) ;
    9999
    100100                        html = html.replace( /<(U|I|STRIKE)>&nbsp;<\/\1>/g, '&nbsp;' ) ;
Note: See TracChangeset for help on using the changeset viewer.
© 2003 – 2015 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy