Browse Source

[svn r21647] FS#2867 - The FCKEditor: Implementing 2.6.5 SVN patch, ticket #2856 - http://dev.fckeditor.net/ticket/2856 .

Ivan Tcholakov 15 years ago
parent
commit
73f438ba47
1 changed files with 4 additions and 4 deletions
  1. 4 4
      main/inc/lib/fckeditor/editor/dialog/fck_paste.html

+ 4 - 4
main/inc/lib/fckeditor/editor/dialog/fck_paste.html

@@ -194,11 +194,11 @@ function CleanWord( oNode, bIgnoreFont, bRemoveStyles )
 	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, "\"" ) ;