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

Merge "Pressing enter in the last listItem, if empty, will exit the list"

Browse source
This commit is contained in:
Trevor Parscal 2012-06-21 05:50:50 +00:00 committed by Gerrit Code Review
parent e657cd802f 0ab3b65c03
commit a7b47a2c00
2 changed files with 42 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -538,7 +538,9 @@ ve.ce.Surface.prototype.onChange = function( transaction, selection ) {
ve.ce.Surface.prototype.handleEnter = function() {
var selection = this.model.getSelection(),
documentModel = this.model.getDocument(),
tx;
emptyParagraph = [{ 'type': 'paragraph' }, { 'type': '/paragraph' }],
tx,
advanceCursor = true;
// Stop polling while we work
this.stopPolling();
// Handle removal first
@ -564,7 +566,6 @@ ve.ce.Surface.prototype.handleEnter = function() {
) {
// If we're at the start/end of something that's not a paragraph, insert a paragraph
// before/after
var emptyParagraph = [{ 'type': 'paragraph' }, { 'type': '/paragraph' }];
if ( cursor === contentBranchModelRange.from ) {
tx = ve.dm.Transaction.newFromInsertion(
documentModel, contentBranchModel.getOuterRange().from, emptyParagraph
@ -576,7 +577,9 @@ ve.ce.Surface.prototype.handleEnter = function() {
}
} else {
// Split
stack = [];
var stack = [],
outermostNode = null;
ve.Node.traverseUpstream( node, function( node ) {
if ( !node.canBeSplit() ) {
return false;
@ -587,16 +590,46 @@ ve.ce.Surface.prototype.handleEnter = function() {
{ 'type': '/' + node.type },
node.model.getClonedElement()
);
outermostNode = node;
return true;
} );
// We must process the transaction first because getRelativeContentOffset can't help us yet
tx = ve.dm.Transaction.newFromInsertion( documentModel, selection.from, stack );
var outerParent = outermostNode.getModel().getParent(),
outerChildrenCount = outerParent.getChildren().length
if (
outermostNode.type == 'listItem' && // this is a list item
outerParent.getChildren()[outerChildrenCount - 1] == outermostNode.getModel() && // this is the last list item
outermostNode.children.length == 1 && // there is one child
node.model.length == 0 // the child is empty
) {
// Enter was pressed in an empty list item.
var list = outermostNode.getModel().getParent();
// Remove the list item
tx = ve.dm.Transaction.newFromRemoval( documentModel, outermostNode.getModel().getOuterRange() );
selection = tx.translateRange( selection );
this.model.change( tx, selection );
// Insert a paragraph
tx = ve.dm.Transaction.newFromInsertion( documentModel, list.getOuterRange().to, emptyParagraph );
advanceCursor = false;
} else {
// We must process the transaction first because getRelativeContentOffset can't help us yet
tx = ve.dm.Transaction.newFromInsertion( documentModel, selection.from, stack );
}
}
this.model.change( tx );
// Now we can move the cursor forward
this.model.change(
null, new ve.Range( documentModel.getRelativeContentOffset( selection.from, 1 ) )
);
if ( advanceCursor ) {
this.model.change(
null, new ve.Range( documentModel.getRelativeContentOffset( selection.from, 1 ) )
);
} else {
this.model.change(
null, new ve.Range( documentModel.getNearestContentOffset( selection.from ) )
);
}
// Reset and resume polling
this.clearPollData();
this.startPolling();

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

@ -477,7 +477,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 null;
return offset;
}
cursor += op.remove.length;
} else if ( op.type === 'retain' ) {