Changeset 4839

Timestamp:

12/29/09 15:18:14 (3 years ago)

Author:

garry.yao

Message:

#4906: Regression of [4767].

File:

• CKEditor/trunk/_source/plugins/pastefromword/filter/default.js (modified) (2 diffs)

CKEditor/trunk/_source/plugins/pastefromword/filter/default.js

@@ -258 +258 @@
                                 return function( cssLength )
                                 {
-                                        if( cssLength.indexOf( '%' ) == -1 )
+                                        if( cssLengthRelativeUnit.test( cssLength ) )
                                         {
                                                 calculator.setStyle( 'width', cssLength );
@@ -627 +627 @@
                                                 {
                                                         attrs.style = stylesFilter(
-                                                                                [ [ ( /^width|height$/ ), null, convertToPx ] ] )( attrs.style ) || '';
+                                                                                [ [ ( /^(:?width|height)$/ ), null, convertToPx ] ] )( attrs.style ) || '';
                                                 }