Changeset 5934


Ignore:
Timestamp:
10/13/2010 07:08:50 AM (4 years ago)
Author:
paho
Message:

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

Location:
CKEditor/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CKEditor/trunk/CHANGES.html

    r5928 r5934  
    4545                        Fixed issues:</p> 
    4646        <ul> 
     47                <li><a href="http://dev.ckeditor.com/ticket/5399">#5399</a> : Lists pasted from Word do not maintain their nesting.</li> 
    4748                <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> 
    4849                <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

    r5714 r5934  
    119119        }; 
    120120 
    121         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; 
     121        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; 
    122122        var emptyMarginRegex = /^(?:\b0[^\s]*\s*){1,4}$/;               // e.g. 0px 0pt 0px 
    123123 
     
    220220                                                                                // Be able to deal with component/short-hand form style. 
    221221                                                                                var values = margin.split( ' ' ); 
    222                                                                                 margin = values[ 3 ] || values[ 1 ] || values [ 0 ]; 
     222                                                                                margin = CKEDITOR.plugins.pastefromword.utils.convertToPx( values[ 3 ] || values[ 1 ] || values [ 0 ] ); 
    223223                                                                                margin = parseInt( margin, 10 ); 
    224224 
Note: See TracChangeset for help on using the changeset viewer.
© 2003 – 2012 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy