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

Merge "Bugzilla:33093 - Shift-Enter splits at paragraphs instead of list items"

Browse source
This commit is contained in:
Trevor Parscal 2012-06-27 16:20:08 +00:00 committed by Gerrit Code Review
parent c02218c736 122a31a021
commit e1905341c1
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -182,7 +182,7 @@ ve.ce.Surface.prototype.onKeyDown = function( e ) {
// Enter
case 13:
e.preventDefault();
this.handleEnter();
this.handleEnter( e );
break;
// Backspace
case 8:
@ -605,14 +605,16 @@ ve.ce.Surface.prototype.onChange = function( transaction, selection ) {
}
};
ve.ce.Surface.prototype.handleEnter = function() {
ve.ce.Surface.prototype.handleEnter = function( e ) {
var selection = this.model.getSelection(),
documentModel = this.model.getDocument(),
emptyParagraph = [{ 'type': 'paragraph' }, { 'type': '/paragraph' }],
tx,
advanceCursor = true;
// Stop polling while we work
this.stopPolling();
// Handle removal first
if ( selection.from !== selection.to ) {
tx = ve.dm.Transaction.newFromRemoval( documentModel, selection );
@ -661,12 +663,16 @@ ve.ce.Surface.prototype.handleEnter = function() {
node.model.getClonedElement()
);
outermostNode = node;
return true;
if ( e.shiftKey ) {
return false;
} else {
return true;
}
} );
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