Ticket #2856: 2856.2.patch

_whatsnew.html

@@ -42 +42 @@
         <p>
                 Fixed Bugs:</p>
         <ul>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2856">#2856</a>] Fixed
+                        problem with inches in paste dialog.</li>
                 <li>Language file updates for the following languages:
                         <ul>
                                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2849">#2849</a>] Lithuanian</li>

editor/dialog/fck_paste.html

@@ -194 +194 @@
         html = html.replace( /\s*mso-[^:]+:[^;"]+;?/gi, '' ) ;
 
         // Remove margin styles.
-        html = html.replace( /\s*MARGIN: 0cm 0cm 0pt\s*;/gi, '' ) ;
-        html = html.replace( /\s*MARGIN: 0cm 0cm 0pt\s*"/gi, "\"" ) ;
+        html = html.replace( /\s*MARGIN: 0(?:cm|in) 0(?:cm|in) 0pt\s*;/gi, '' ) ;
+        html = html.replace( /\s*MARGIN: 0(?:cm|in) 0(?:cm|in) 0pt\s*"/gi, "\"" ) ;
 
-        html = html.replace( /\s*TEXT-INDENT: 0cm\s*;/gi, '' ) ;
-        html = html.replace( /\s*TEXT-INDENT: 0cm\s*"/gi, "\"" ) ;
+        html = html.replace( /\s*TEXT-INDENT: 0(?:cm|in)\s*;/gi, '' ) ;
+        html = html.replace( /\s*TEXT-INDENT: 0(?:cm|in)\s*"/gi, "\"" ) ;
 
         html = html.replace( /\s*TEXT-ALIGN: [^\s;]+;?"/gi, "\"" ) ;