wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-29 00:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Replace text strings with grapheme arrays in onContentChange"

Browse source
This commit is contained in:
jenkins-bot 2013-07-15 22:10:20 +00:00 committed by Gerrit Code Review
parent fde142ae86 4af4f7928d
commit 4854b00770
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/ve/ce/ve.ce.Surface.js
View file

@ -787,6 +787,7 @@ ve.ce.Surface.prototype.onSelectionChange = function ( oldRange, newRange ) {
ve.ce.Surface.prototype.onContentChange = function ( node, previous, next ) { ve.ce.Surface.prototype.onContentChange = function ( node, previous, next ) {
var data, range, len, annotations, offsetDiff, lengthDiff, sameLeadingAndTrailing, var data, range, len, annotations, offsetDiff, lengthDiff, sameLeadingAndTrailing,
previousStart, nextStart, newRange, previousStart, nextStart, newRange,
previousData, nextData,
fromLeft = 0, fromLeft = 0,
fromRight = 0, fromRight = 0,
nodeOffset = node.getModel().getOffset(); nodeOffset = node.getModel().getOffset();
@ -856,20 +857,22 @@ ve.ce.Surface.prototype.onContentChange = function ( node, previous, next ) {
// Complex change // Complex change
len = Math.min( previous.text.length, next.text.length ); previousData = ve.splitClusters( previous.text );
nextData = ve.splitClusters( next.text );
len = Math.min( previousData.length, nextData.length );
// Count same characters from left // Count same characters from left
while ( fromLeft < len && previous.text[fromLeft] === next.text[fromLeft] ) { while ( fromLeft < len && previousData[fromLeft] === nextData[fromLeft] ) {
++fromLeft; ++fromLeft;
} }
// Count same characters from right // Count same characters from right
while ( while (
fromRight < len - fromLeft && fromRight < len - fromLeft &&
previous.text[previous.text.length - 1 - fromRight] === previousData[previousData.length - 1 - fromRight] ===
next.text[next.text.length - 1 - fromRight] nextData[nextData.length - 1 - fromRight]
) { ) {
++fromRight; ++fromRight;
} }
data = ve.splitClusters( next.text ).slice( fromLeft, next.text.length - fromRight ); data = nextData.slice( fromLeft, nextData.length - fromRight );
// Get annotations to the left of new content and apply // Get annotations to the left of new content and apply
annotations = annotations =
this.model.getDocument().data.getAnnotationsFromOffset( nodeOffset + 1 + fromLeft ); this.model.getDocument().data.getAnnotationsFromOffset( nodeOffset + 1 + fromLeft );
@ -888,13 +891,13 @@ ve.ce.Surface.prototype.onContentChange = function ( node, previous, next ) {
newRange newRange
); );
} }
if ( fromLeft + fromRight < previous.text.length ) { if ( fromLeft + fromRight < previousData.length ) {
this.model.change( this.model.change(
ve.dm.Transaction.newFromRemoval( ve.dm.Transaction.newFromRemoval(
this.documentView.model, this.documentView.model,
new ve.Range( new ve.Range(
data.length + nodeOffset + 1 + fromLeft, data.length + nodeOffset + 1 + fromLeft,
data.length + nodeOffset + 1 + previous.text.length - fromRight data.length + nodeOffset + 1 + previousData.length - fromRight
) )
), ),
newRange newRange