|
|
@@ -196,49 +196,6 @@ describe( 'IndentCommand', () => {
|
|
|
'<listItem indent="0" type="bulleted">g</listItem>'
|
|
|
);
|
|
|
} );
|
|
|
-
|
|
|
- it( 'should fix list type when item is intended #1', () => {
|
|
|
- setData(
|
|
|
- model,
|
|
|
- '<listItem indent="0" type="bulleted">a</listItem>' +
|
|
|
- '<listItem indent="1" type="bulleted">b</listItem>' +
|
|
|
- '<listItem indent="2" type="numbered">c</listItem>' +
|
|
|
- '<listItem indent="1" type="bulleted">[]d</listItem>'
|
|
|
- );
|
|
|
-
|
|
|
- command.execute();
|
|
|
-
|
|
|
- expect( getData( model, { withoutSelection: true } ) ).to.equal(
|
|
|
- '<listItem indent="0" type="bulleted">a</listItem>' +
|
|
|
- '<listItem indent="1" type="bulleted">b</listItem>' +
|
|
|
- '<listItem indent="2" type="numbered">c</listItem>' +
|
|
|
- '<listItem indent="2" type="numbered">d</listItem>'
|
|
|
- );
|
|
|
- } );
|
|
|
-
|
|
|
- // Not only boundary list items has to be fixed, but also items in the middle of selection.
|
|
|
- it( 'should fix list type when item is intended #2', () => {
|
|
|
- setData(
|
|
|
- model,
|
|
|
- '<listItem indent="0" type="bulleted">a</listItem>' +
|
|
|
- '<listItem indent="1" type="numbered">b</listItem>' +
|
|
|
- '<listItem indent="1" type="numbered">[c</listItem>' +
|
|
|
- '<listItem indent="0" type="bulleted">d</listItem>' +
|
|
|
- '<listItem indent="1" type="numbered">e]</listItem>' +
|
|
|
- '<listItem indent="0" type="bulleted">f</listItem>'
|
|
|
- );
|
|
|
-
|
|
|
- command.execute();
|
|
|
-
|
|
|
- expect( getData( model, { withoutSelection: true } ) ).to.equal(
|
|
|
- '<listItem indent="0" type="bulleted">a</listItem>' +
|
|
|
- '<listItem indent="1" type="numbered">b</listItem>' +
|
|
|
- '<listItem indent="2" type="numbered">c</listItem>' +
|
|
|
- '<listItem indent="1" type="numbered">d</listItem>' +
|
|
|
- '<listItem indent="2" type="numbered">e</listItem>' +
|
|
|
- '<listItem indent="0" type="bulleted">f</listItem>'
|
|
|
- );
|
|
|
- } );
|
|
|
} );
|
|
|
} );
|
|
|
|
|
|
@@ -357,104 +314,6 @@ describe( 'IndentCommand', () => {
|
|
|
);
|
|
|
} );
|
|
|
|
|
|
- it( 'should fix list type when item is outdented #1', () => {
|
|
|
- setData(
|
|
|
- model,
|
|
|
- '<listItem indent="0" type="bulleted">a</listItem>' +
|
|
|
- '<listItem indent="1" type="bulleted">b</listItem>' +
|
|
|
- '<listItem indent="2" type="numbered">[]c</listItem>'
|
|
|
- );
|
|
|
-
|
|
|
- command.execute();
|
|
|
-
|
|
|
- expect( getData( model, { withoutSelection: true } ) ).to.equal(
|
|
|
- '<listItem indent="0" type="bulleted">a</listItem>' +
|
|
|
- '<listItem indent="1" type="bulleted">b</listItem>' +
|
|
|
- '<listItem indent="1" type="bulleted">c</listItem>'
|
|
|
- );
|
|
|
- } );
|
|
|
-
|
|
|
- // Look at next siblings if, after outdenting, a list item is a first item in it's list (list item "c").
|
|
|
- it( 'should fix list type when item is outdented #2', () => {
|
|
|
- setData(
|
|
|
- model,
|
|
|
- '<listItem indent="0" type="bulleted">a</listItem>' +
|
|
|
- '<listItem indent="1" type="numbered">[]b</listItem>' +
|
|
|
- '<listItem indent="2" type="bulleted">c</listItem>' +
|
|
|
- '<listItem indent="1" type="numbered">d</listItem>'
|
|
|
- );
|
|
|
-
|
|
|
- command.execute();
|
|
|
-
|
|
|
- expect( getData( model, { withoutSelection: true } ) ).to.equal(
|
|
|
- '<listItem indent="0" type="bulleted">a</listItem>' +
|
|
|
- '<listItem indent="0" type="bulleted">b</listItem>' +
|
|
|
- '<listItem indent="1" type="numbered">c</listItem>' +
|
|
|
- '<listItem indent="1" type="numbered">d</listItem>'
|
|
|
- );
|
|
|
- } );
|
|
|
-
|
|
|
- // Reported in #53.
|
|
|
- it( 'should fix list type when item is outdented #3', () => {
|
|
|
- setData(
|
|
|
- model,
|
|
|
- '<listItem indent="0" type="bulleted">a</listItem>' +
|
|
|
- '<listItem indent="1" type="numbered">[b</listItem>' +
|
|
|
- '<listItem indent="1" type="numbered">c</listItem>' +
|
|
|
- '<listItem indent="1" type="numbered">d]</listItem>'
|
|
|
- );
|
|
|
-
|
|
|
- command.execute();
|
|
|
-
|
|
|
- expect( getData( model, { withoutSelection: true } ) ).to.equal(
|
|
|
- '<listItem indent="0" type="bulleted">a</listItem>' +
|
|
|
- '<listItem indent="0" type="bulleted">b</listItem>' +
|
|
|
- '<listItem indent="0" type="bulleted">c</listItem>' +
|
|
|
- '<listItem indent="0" type="bulleted">d</listItem>'
|
|
|
- );
|
|
|
- } );
|
|
|
-
|
|
|
- it( 'should fix list type when item is outdented to top level (if needed)', () => {
|
|
|
- setData(
|
|
|
- model,
|
|
|
- '<listItem indent="0" type="bulleted">a</listItem>' +
|
|
|
- '<listItem indent="1" type="numbered">[]b</listItem>' +
|
|
|
- '<listItem indent="0" type="numbered">c</listItem>'
|
|
|
- );
|
|
|
-
|
|
|
- command.execute();
|
|
|
-
|
|
|
- // Another possible behaviour would be that "b" list item becomes first list item of a top level
|
|
|
- // numbered list (so it does not change it's type) but it seems less correct from UX standpoint.
|
|
|
- expect( getData( model, { withoutSelection: true } ) ).to.equal(
|
|
|
- '<listItem indent="0" type="bulleted">a</listItem>' +
|
|
|
- '<listItem indent="0" type="bulleted">b</listItem>' +
|
|
|
- '<listItem indent="0" type="numbered">c</listItem>'
|
|
|
- );
|
|
|
- } );
|
|
|
-
|
|
|
- it( 'should not fix nested list items\' type when not needed', () => {
|
|
|
- // There was a bug that the nested sub-list changed it's type because for a while, it was on same indent
|
|
|
- // level as the originally outdented element.
|
|
|
- setData(
|
|
|
- model,
|
|
|
- '<listItem indent="0" type="bulleted">a</listItem>' +
|
|
|
- '<listItem indent="1" type="numbered">b</listItem>' +
|
|
|
- '<listItem indent="1" type="numbered">[]c</listItem>' +
|
|
|
- '<listItem indent="2" type="bulleted">d</listItem>' +
|
|
|
- '<listItem indent="2" type="bulleted">e</listItem>'
|
|
|
- );
|
|
|
-
|
|
|
- command.execute();
|
|
|
-
|
|
|
- expect( getData( model, { withoutSelection: true } ) ).to.equal(
|
|
|
- '<listItem indent="0" type="bulleted">a</listItem>' +
|
|
|
- '<listItem indent="1" type="numbered">b</listItem>' +
|
|
|
- '<listItem indent="0" type="bulleted">c</listItem>' +
|
|
|
- '<listItem indent="1" type="bulleted">d</listItem>' +
|
|
|
- '<listItem indent="1" type="bulleted">e</listItem>'
|
|
|
- );
|
|
|
- } );
|
|
|
} );
|
|
|
} );
|
|
|
} );
|