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

Merge "Fixed output of translateOffset when collapsing a range"

Browse source
This commit is contained in:
Catrope 2012-06-21 17:48:43 +00:00 committed by Gerrit Code Review
parent f27425eb91 5aa3bbedc7
commit ff39a448a3
2 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
modules/ve/dm/ve.dm.Transaction.js
View file

@ -457,11 +457,14 @@ ve.dm.Transaction.prototype.getLengthDifference = function() {
};
/**
* Compute what a given offset in the pre-transaction linear model maps to after the transaction
* has been applied.
* Translate an offset based on a transaction.
*
* @param {Number} offset Offset in the linear model before the transaction
* @returns {Number|null} Offset of the same thing after the transaction, or null if it was removed
* This is useful when you want to anticipate what an offset will be after a transaction is
* processed.
*
* @method
* @param {Number} offset Offset in the linear model before the transaction has been processed
* @returns {Number} Translated offset, as it will be after processing transaction
*/
ve.dm.Transaction.prototype.translateOffset = function( offset ) {
var i, cursor = 0, adjustment = 0, op, opLength;
@ -477,7 +480,7 @@ ve.dm.Transaction.prototype.translateOffset = function( offset ) {
return offset + adjustment;
} else if ( offset > cursor && offset < cursor + op.remove.length ) {
// The offset points inside of the removal
return offset;
return cursor + op.remove.length + adjustment;
}
cursor += op.remove.length;
} else if ( op.type === 'retain' ) {
@ -491,18 +494,18 @@ ve.dm.Transaction.prototype.translateOffset = function( offset ) {
};
/**
* Translate a range using translateOffset()
* @param {ve.Range} range Range to translate
* @returns {ve.Range|null} Translated range if both start and end could be translated, or null
* Translate a range based on a transaction.
*
* This is useful when you want to anticipate what a selection will be after a transaction is
* processed.
*
* @method
* @see {translateOffset}
* @param {ve.Range} range Range in the linear model before the transaction has been processed
* @returns {ve.Range} Translated range, as it will be after processing transaction
*/
ve.dm.Transaction.prototype.translateRange = function( range ) {
var from = this.translateOffset( range.from ),
to = this.translateOffset( range.to );
if ( from && to ) {
return new ve.Range( from, to );
} else {
return null;
}
return new ve.Range( this.translateOffset( range.from ), this.translateOffset( range.to ) );
};
/**

6
tests/ve/dm/ve.dm.Transaction.test.js
View file

@ -702,9 +702,9 @@ test( 'translateOffset', function() {
3: 6,
4: 7,
5: 8,
6: null,
7: null,
8: null,
6: 8,
7: 8,
8: 8,
9: 8,
10: 9,
11: 10,