Ticket #2856: 2856.2.patch

File 2856.2.patch, 1.4 KB (added by Artur Formella, 10 years ago)
  • _whatsnew.html

     
    4242        <p>
    4343                Fixed Bugs:</p>
    4444        <ul>
     45                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2856">#2856</a>] Fixed
     46                        problem with inches in paste dialog.</li>
    4547                <li>Language file updates for the following languages:
    4648                        <ul>
    4749                                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2849">#2849</a>] Lithuanian</li>
  • editor/dialog/fck_paste.html

     
    194194        html = html.replace( /\s*mso-[^:]+:[^;"]+;?/gi, '' ) ;
    195195
    196196        // Remove margin styles.
    197         html = html.replace( /\s*MARGIN: 0cm 0cm 0pt\s*;/gi, '' ) ;
    198         html = html.replace( /\s*MARGIN: 0cm 0cm 0pt\s*"/gi, "\"" ) ;
     197        html = html.replace( /\s*MARGIN: 0(?:cm|in) 0(?:cm|in) 0pt\s*;/gi, '' ) ;
     198        html = html.replace( /\s*MARGIN: 0(?:cm|in) 0(?:cm|in) 0pt\s*"/gi, "\"" ) ;
    199199
    200         html = html.replace( /\s*TEXT-INDENT: 0cm\s*;/gi, '' ) ;
    201         html = html.replace( /\s*TEXT-INDENT: 0cm\s*"/gi, "\"" ) ;
     200        html = html.replace( /\s*TEXT-INDENT: 0(?:cm|in)\s*;/gi, '' ) ;
     201        html = html.replace( /\s*TEXT-INDENT: 0(?:cm|in)\s*"/gi, "\"" ) ;
    202202
    203203        html = html.replace( /\s*TEXT-ALIGN: [^\s;]+;?"/gi, "\"" ) ;
    204204
© 2003 – 2019 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy