Ticket #3949: 3949_3.patch
File 3949_3.patch, 2.3 KB (added by , 15 years ago) |
---|
-
_source/plugins/selection/plugin.js
491 491 } 492 492 493 493 testRange.setEndPoint( 'StartToStart', range ); 494 var distance = testRange.text.length; 494 // IE report line break as CRLF with range.text but 495 // only LF with textnode.nodeValue, normalize them to avoid 496 // breaking character counting logic below. (#3949) 497 var distance = testRange.text.replace( /(\r\n|\r)/g, '\n' ).length; 495 498 496 499 while ( distance > 0 ) 497 500 distance -= siblings[ --i ].nodeValue.length; … … 943 943 CKEDITOR.dom.range.prototype.select = 944 944 CKEDITOR.env.ie ? 945 945 // V2 946 function( )946 function( forceExpand ) 947 947 { 948 948 var collapsed = this.collapsed; 949 949 var isStartMarkerAlone; … … 983 983 // will expand and that the cursor will be blinking on the right place. 984 984 // Actually, we are using this flag just to avoid using this hack in all 985 985 // situations, but just on those needed. 986 isStartMarkerAlone = !startNode.hasPrevious() || ( startNode.getPrevious().is && startNode.getPrevious().is( 'br' ) );986 isStartMarkerAlone = forceExpand || !startNode.hasPrevious() || ( startNode.getPrevious().is && startNode.getPrevious().is( 'br' ) ); 987 987 988 988 // Append a temporary <span></span> before the selection. 989 989 // This is needed to avoid IE destroying selections inside emptyIndex: CHANGES.html -
CHANGES.html
130 130 <li><a href="http://dev.fckeditor.net/ticket/3742">#3742</a> : Fixed wrong dialog layout for dialogs without tab bar in IE RTL mode .</li> 131 131 <li><a href="http://dev.fckeditor.net/ticket/3671">#3671</a> : Fixed body fixing should be applied to the real type under fake elements.</li> 132 132 <li><a href="http://dev.fckeditor.net/ticket/3836">#3836</a> : Fixed remove list in enterMode=BR will merge sibling text to one line.</li> 133 <li><a href="http://dev.fckeditor.net/ticket/3949">#3949</a> : Fixed enterKey within pre-formatted text introduce wrong line-break.</li> 133 134 </ul> 134 135 <h3> 135 136 CKEditor 3.0 RC</h3>