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

Merge "Fix indent action when acting on multiple list items"

Browse source
This commit is contained in:
jenkins-bot 2013-05-13 17:49:00 +00:00 committed by Gerrit Code Review
parent 0d006f5976 a9d0a5c7ef
commit 2dddb90731
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/ve/actions/ve.IndentationAction.js
View file

@ -55,7 +55,7 @@ ve.IndentationAction.prototype.increase = function () {
for ( i = 0; i < groups.length; i++ ) { for ( i = 0; i < groups.length; i++ ) {
group = groups[i]; group = groups[i];
if ( group.grandparent && group.grandparent.getType() === 'list' ) { if ( group.grandparent && group.grandparent.getType() === 'list' ) {
fragments.push( surfaceModel.getFragment( group.parent.getOuterRange(), true ) ); fragments.push( surfaceModel.getFragment( group.parent.getRange(), true ) );
increased = true; increased = true;
} }
} }
@ -63,7 +63,7 @@ ve.IndentationAction.prototype.increase = function () {
// Process each fragment (their ranges are automatically adjusted on change) // Process each fragment (their ranges are automatically adjusted on change)
for ( i = 0; i < fragments.length; i++ ) { for ( i = 0; i < fragments.length; i++ ) {
this.indentListItem( this.indentListItem(
documentModel.getNodeFromOffset( fragments[i].getRange().start + 1 ) documentModel.getNodeFromOffset( fragments[i].getRange().start )
); );
} }

12
modules/ve/test/actions/ve.IndentationAction.test.js
View file

@ -36,7 +36,7 @@ function runIndentationChangeTest( assert, range, method, expectedSelection, exp
surface.destroy(); surface.destroy();
} }
QUnit.test( 'decrease', 2, function ( assert ) { QUnit.test( 'increase/decrease', 2, function ( assert ) {
var i, var i,
cases = [ cases = [
{ {
@ -70,6 +70,16 @@ QUnit.test( 'decrease', 2, function ( assert ) {
delete data[12].internal; delete data[12].internal;
}, },
'msg': 'decrease indentation on Items 1 & 2' 'msg': 'decrease indentation on Items 1 & 2'
},
{
'range': new ve.Range( 3, 19 ),
'method': 'increase',
'expectedSelection': new ve.Range( 5, 21 ),
'expectedData': function ( data ) {
data.splice( 0, 0, { 'type': 'list', 'attributes': { 'style': 'bullet' } }, { 'type': 'listItem' } );
data.splice( 23, 0, { 'type': '/list' }, { 'type': '/listItem' } );
},
'msg': 'increase indentation on Items 1 & 2'
} }
]; ];