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

Merge branch 'dmrewrite' of ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor into dmrewrite

Browse source
This commit is contained in:
Christian Williams 2012-05-11 15:59:38 -07:00
parent c79b911469 db0e050b39
commit f5430f25c3
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/ve2/dm/ve.dm.Transaction.js
View file

@ -94,15 +94,15 @@ ve.dm.Transaction.prototype.pushRemove = function( data ) {
*
* @method
* @param {Array} remove Data to remove
* @param {Array] replacement Data to replace 'remove' with
* @param {Array] insert Data to replace 'remove' with
*/
ve.dm.Transaction.prototype.pushReplace = function( remove, replacement ) {
ve.dm.Transaction.prototype.pushReplace = function( remove, insert ) {
this.operations.push( {
'type': 'replace',
'remove': remove,
'replacement': replacement
'insert': insert
} );
this.lengthDifference += replacement.length - remove.length;
this.lengthDifference += insert.length - remove.length;
};
/**

34
modules/ve2/dm/ve.dm.TransactionProcessor.js
View file

@ -202,36 +202,36 @@ ve.dm.TransactionProcessor.prototype.attribute = function( op ) {
* model tree needs to be synchronized, and queues this in the DocumentSynchronizer.
*
* op.remove isn't checked against the actual data (instead op.remove.length things are removed
* starting at this.cursor), but it's used instead of op.replacement in reverse mode. So if
* starting at this.cursor), but it's used instead of op.insert in reverse mode. So if
* op.remove is incorrect but of the right length, the transaction will commit fine, but won't roll
* back correctly.
*
*
* @param {Object} op Operation object
* remove: Linear model data fragment to remove
* replacement: Linear model data fragment to insert
* insert: Linear model data fragment to insert
*/
ve.dm.TransactionProcessor.prototype.replace = function( op ) {
var remove = this.reversed ? op.replacement : op.remove,
replacement = this.reversed ? op.remove : op.replacement,
var remove = this.reversed ? op.insert : op.remove,
insert = this.reversed ? op.remove : op.insert,
removeHasStructure = ve.dm.Document.containsElementData( remove ),
replacementHasStructure = ve.dm.Document.containsElementData( replacement ),
insertHasStructure = ve.dm.Document.containsElementData( insert ),
node;
// Figure out if this is a structural replacement or a content replacement
if ( !removeHasStructure && !replacementHasStructure ) {
// Content replacement
// Figure out if this is a structural insert or a content insert
if ( !removeHasStructure && !insertHasStructure ) {
// Content insert
// Update the linear model
ve.batchSplice( this.document.data, this.cursor, remove.length, replacement );
this.applyAnnotations( this.cursor + replacement.length );
ve.batchSplice( this.document.data, this.cursor, remove.length, insert );
this.applyAnnotations( this.cursor + insert.length );
// Get the node containing the replaced content
node = this.document.getNodeFromOffset( this.cursor );
// Queue a resize for this node
this.synchronizer.pushResize( node, replacement.length - remove.length );
this.synchronizer.pushResize( node, insert.length - remove.length );
// Advance the cursor
this.cursor += replacement.length;
this.cursor += insert.length;
} else {
// Structural replacement
// Structural insert
// TODO generalize for insert/remove
// It's possible that multiple replace operations are needed before the
@ -249,14 +249,14 @@ ve.dm.TransactionProcessor.prototype.replace = function( op ) {
while ( true ) {
if ( operation.type == 'replace' ) {
var opRemove = this.reversed ? operation.replacement : operation.remove,
opReplacement = this.reversed ? operation.remove : operation.replacement;
// Update the linear model for this replacement
var opRemove = this.reversed ? operation.insert : operation.remove,
opInsert = this.reversed ? operation.remove : operation.insert;
// Update the linear model for this insert
ve.batchSplice( this.document.data, this.cursor, opRemove.length, opReplacement );
this.cursor += opReplacement.length;
adjustment += opReplacement.length - opRemove.length;
// Walk through the remove and replacement data
// Walk through the remove and insert data
// and keep track of the element depth change (level)
// for each of these two separately. The model is
// only consistent if both levels are zero.