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

Fixed issue with inserting data that starts with closing elements

Browse source
This commit is contained in:
Trevor Parscal 2011-12-07 02:13:43 +00:00
parent 38bc605f66
commit 893d337c48
1 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
modules/es/es.TransactionProcessor.js
View file

@ -256,41 +256,43 @@ es.TransactionProcessor.prototype.retain = function( op ) {
};
es.TransactionProcessor.prototype.insert = function( op ) {
var node;
// If the cursor is on the left of a structural offset, it's going to the the parent node of
// the element we want to be inserting into
if ( es.DocumentModel.isStructuralOffset( this.model.data, this.cursor ) ) {
node = this.model.getNodeFromOffset( this.cursor + 1 );
} else {
node = this.model.getNodeFromOffset( this.cursor );
}
var offset;
if ( node.getParent() === this.model ) {
offset = this.model.getOffsetFromNode( node );
} else {
node = this.getScope( node, op.data );
offset = this.model.getOffsetFromNode( node );
}
if ( es.DocumentModel.containsElementData( op.data ) ) {
// Perform insert on linear data model
es.insertIntoArray( this.model.data, this.cursor, op.data );
this.applyAnnotations( this.cursor + op.data.length );
// Synchronize model tree
if ( offset === -1 ) {
throw 'Invalid offset error. Node is not in model tree';
}
var node = this.model.getNodeFromOffset( this.cursor ),
offset;
// Perform insert on linear data model
es.insertIntoArray( this.model.data, this.cursor, op.data );
this.applyAnnotations( this.cursor + op.data.length );
if (
es.DocumentModel.isStructuralOffset( this.model.data, this.cursor ) &&
( typeof op.data[0].type === 'string' && op.data[0].type.charAt( 0 ) !== '/' )
) {
offset = node === this.model ? 0 : this.model.getOffsetFromNode( node );
this.rebuildNodes(
this.model.data.slice( offset, offset + node.getElementLength() + op.data.length ),
[node]
this.model.data.slice( this.cursor, op.data.length ),
null,
node,
node.getIndexFromOffset( this.cursor - offset )
);
} else {
// Perform insert on linear data model
// TODO this is duplicated from above
es.insertIntoArray( this.model.data, this.cursor, op.data );
this.applyAnnotations( this.cursor + op.data.length );
// Update model tree
node.adjustContentLength( op.data.length, true );
node.emit( 'update', this.cursor - offset );
if ( node.getParent() === this.model ) {
offset = this.model.getOffsetFromNode( node );
} else {
node = this.getScope( node, op.data );
offset = this.model.getOffsetFromNode( node );
}
if ( es.DocumentModel.containsElementData( op.data ) ) {
// Synchronize model tree
if ( offset === -1 ) {
throw 'Invalid offset error. Node is not in model tree';
}
this.rebuildNodes(
this.model.data.slice( offset, offset + node.getElementLength() + op.data.length ),
[node]
);
} else {
// Update model tree
node.adjustContentLength( op.data.length, true );
node.emit( 'update', this.cursor - offset );
}
}
this.cursor += op.data.length;
};