Changeset 5934

Timestamp:

10/13/10 07:08:50 (3 years ago)

Author:

paho

Message:

#5399: Lists pasted from Word do not maintain their nesting.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/pastefromword/filter/default.js (modified) (2 diffs)

CKEditor/trunk/CHANGES.html

@@ -45 +45 @@
                         Fixed issues:</p>
         <ul>
+                <li><a href="http://dev.ckeditor.com/ticket/5399">#5399</a> : Lists pasted from Word do not maintain their nesting.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/6377">#6377</a> : FF width and height are not shown for smiley in Image properties dialog.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/5237">#5237</a> : English text in dialogs' title was flipped when using RTL language (office2003 and v2 skins).</li>

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

@@ -119 +119 @@
         };
 
-        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;
+        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;
         var emptyMarginRegex = /^(?:\b0[^\s]*\s*){1,4}$/;               // e.g. 0px 0pt 0px
 
@@ -220 +220 @@
                                                                                 // Be able to deal with component/short-hand form style.
                                                                                 var values = margin.split( ' ' );
-                                                                                margin = values[ 3 ] || values[ 1 ] || values [ 0 ];
+                                                                                margin = CKEDITOR.plugins.pastefromword.utils.convertToPx( values[ 3 ] || values[ 1 ] || values [ 0 ] );
                                                                                 margin = parseInt( margin, 10 );