Ticket #5399: pastefromword.patch
File pastefromword.patch, 1.2 KB (added by , 14 years ago) |
---|
-
plugins/pastefromword/filter/default.js
120 120 return result; 121 121 }; 122 122 123 var cssLengthRelativeUnit = /^( \d[.\d]*)+(em|ex|px|gd|rem|vw|vh|vm|ch|mm|cm|in|pt|pc|deg|rad|ms|s|hz|khz){1}?/i;123 var cssLengthRelativeUnit = /^([.\d]*)+(em|ex|px|gd|rem|vw|vh|vm|ch|mm|cm|in|pt|pc|deg|rad|ms|s|hz|khz){1}?/i; 124 124 var emptyMarginRegex = /^(?:\b0[^\s]*\s*){1,4}$/; 125 125 126 126 var listBaseIndent = 0, … … 223 223 // Be able to deal with component/short-hand form style. 224 224 var values = margin.split( ' ' ); 225 225 margin = values[ 3 ] || values[ 1 ] || values [ 0 ]; 226 margin = CKEDITOR.plugins.pastefromword.utils.convertToPx(margin); 226 227 margin = parseInt( margin, 10 ); 227 228 228 229 // Figure out the indent unit by looking at the first increament. … … 979 980 980 981 // Preserve clear float style. 981 982 [ ( /^clear$/ ) ], 983 [ ( /^list-style-type$/ ) ], 982 984 983 985 [ ( /^border.*|margin.*|vertical-align|float$/ ), null, 984 986 function( value, element )