|
|
@@ -232,8 +232,8 @@ describe( 'EditingController', () => {
|
|
|
it( 'should convert adding marker', () => {
|
|
|
const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );
|
|
|
|
|
|
- model.change( () => {
|
|
|
- model.markers.set( 'marker', range );
|
|
|
+ model.change( writer => {
|
|
|
+ writer.setMarker( 'marker', range );
|
|
|
} );
|
|
|
|
|
|
expect( getViewData( editing.view, { withoutSelection: true } ) )
|
|
|
@@ -243,12 +243,12 @@ describe( 'EditingController', () => {
|
|
|
it( 'should convert removing marker', () => {
|
|
|
const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );
|
|
|
|
|
|
- model.change( () => {
|
|
|
- model.markers.set( 'marker', range );
|
|
|
+ model.change( writer => {
|
|
|
+ writer.setMarker( 'marker', range );
|
|
|
} );
|
|
|
|
|
|
- model.change( () => {
|
|
|
- model.markers.remove( 'marker' );
|
|
|
+ model.change( writer => {
|
|
|
+ writer.removeMarker( 'marker' );
|
|
|
} );
|
|
|
|
|
|
expect( getViewData( editing.view, { withoutSelection: true } ) )
|
|
|
@@ -258,14 +258,14 @@ describe( 'EditingController', () => {
|
|
|
it( 'should convert changing marker', () => {
|
|
|
const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );
|
|
|
|
|
|
- model.change( () => {
|
|
|
- model.markers.set( 'marker', range );
|
|
|
+ model.change( writer => {
|
|
|
+ writer.setMarker( 'marker', range );
|
|
|
} );
|
|
|
|
|
|
const range2 = new ModelRange( new ModelPosition( modelRoot, [ 0, 0 ] ), new ModelPosition( modelRoot, [ 0, 2 ] ) );
|
|
|
|
|
|
- model.change( () => {
|
|
|
- model.markers.set( 'marker', range2 );
|
|
|
+ model.change( writer => {
|
|
|
+ writer.setMarker( 'marker', range2 );
|
|
|
} );
|
|
|
|
|
|
expect( getViewData( editing.view, { withoutSelection: true } ) )
|
|
|
@@ -275,11 +275,8 @@ describe( 'EditingController', () => {
|
|
|
it( 'should convert insertion into marker', () => {
|
|
|
const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );
|
|
|
|
|
|
- model.change( () => {
|
|
|
- model.markers.set( 'marker', range );
|
|
|
- } );
|
|
|
-
|
|
|
model.change( writer => {
|
|
|
+ writer.setMarker( 'marker', range );
|
|
|
writer.insertText( 'xyz', new ModelPosition( modelRoot, [ 1, 0 ] ) );
|
|
|
} );
|
|
|
|
|
|
@@ -290,8 +287,8 @@ describe( 'EditingController', () => {
|
|
|
it( 'should convert move to marker', () => {
|
|
|
const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );
|
|
|
|
|
|
- model.change( () => {
|
|
|
- model.markers.set( 'marker', range );
|
|
|
+ model.change( writer => {
|
|
|
+ writer.setMarker( 'marker', range );
|
|
|
} );
|
|
|
|
|
|
model.change( writer => {
|
|
|
@@ -308,8 +305,8 @@ describe( 'EditingController', () => {
|
|
|
it( 'should convert move from marker', () => {
|
|
|
const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );
|
|
|
|
|
|
- model.change( () => {
|
|
|
- model.markers.set( 'marker', range );
|
|
|
+ model.change( writer => {
|
|
|
+ writer.setMarker( 'marker', range );
|
|
|
} );
|
|
|
|
|
|
model.change( writer => {
|
|
|
@@ -326,8 +323,8 @@ describe( 'EditingController', () => {
|
|
|
it( 'should convert the whole marker move', () => {
|
|
|
const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 0, 3 ] ) );
|
|
|
|
|
|
- model.change( () => {
|
|
|
- model.markers.set( 'marker', range );
|
|
|
+ model.change( writer => {
|
|
|
+ writer.setMarker( 'marker', range );
|
|
|
} );
|
|
|
|
|
|
model.change( writer => {
|
|
|
@@ -386,7 +383,7 @@ describe( 'EditingController', () => {
|
|
|
|
|
|
it( 'should remove marker from view if it will be affected by insert operation', () => {
|
|
|
model.change( writer => {
|
|
|
- writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ) );
|
|
|
+ writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ), { usingOperation: true } );
|
|
|
} );
|
|
|
|
|
|
// Adding with 'high' priority, because `applyOperation` is decorated - its default callback is fired with 'normal' priority.
|
|
|
@@ -404,7 +401,7 @@ describe( 'EditingController', () => {
|
|
|
|
|
|
it( 'should remove marker from view if it will be affected by remove operation', () => {
|
|
|
model.change( writer => {
|
|
|
- writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ) );
|
|
|
+ writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ), { usingOperation: true } );
|
|
|
} );
|
|
|
|
|
|
// Adding with 'high' priority, because `applyOperation` is decorated - its default callback is fired with 'normal' priority.
|
|
|
@@ -422,7 +419,7 @@ describe( 'EditingController', () => {
|
|
|
|
|
|
it( 'should remove marker from view if it will be affected by move operation', () => {
|
|
|
model.change( writer => {
|
|
|
- writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ) );
|
|
|
+ writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ), { usingOperation: true } );
|
|
|
} );
|
|
|
|
|
|
// Adding with 'high' priority, because `applyOperation` is decorated - its default callback is fired with 'normal' priority.
|
|
|
@@ -442,7 +439,11 @@ describe( 'EditingController', () => {
|
|
|
|
|
|
it( 'should remove marker from view if it will be affected by rename operation', () => {
|
|
|
model.change( writer => {
|
|
|
- writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( modelRoot, 0, modelRoot, 1 ) );
|
|
|
+ writer.setMarker(
|
|
|
+ 'marker',
|
|
|
+ ModelRange.createFromParentsAndOffsets( modelRoot, 0, modelRoot, 1 ),
|
|
|
+ { usingOperation: true }
|
|
|
+ );
|
|
|
} );
|
|
|
|
|
|
// Adding with 'high' priority, because `applyOperation` is decorated - its default callback is fired with 'normal' priority.
|
|
|
@@ -460,7 +461,7 @@ describe( 'EditingController', () => {
|
|
|
|
|
|
it( 'should remove marker from view if it will be affected by marker operation', () => {
|
|
|
model.change( writer => {
|
|
|
- writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ) );
|
|
|
+ writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ), { usingOperation: true } );
|
|
|
} );
|
|
|
|
|
|
// Adding with 'high' priority, because `applyOperation` is decorated - its default callback is fired with 'normal' priority.
|
|
|
@@ -472,7 +473,7 @@ describe( 'EditingController', () => {
|
|
|
model.change( writer => {
|
|
|
const p2 = p1.nextSibling;
|
|
|
|
|
|
- writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p2, 1, p2, 2 ) );
|
|
|
+ writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p2, 1, p2, 2 ), { usingOperation: true } );
|
|
|
} );
|
|
|
|
|
|
expect( getViewData( editing.view, { withoutSelection: true } ) ).to.equal( '<p>foo</p><p>b<span>a</span>r</p>' );
|
|
|
@@ -480,7 +481,7 @@ describe( 'EditingController', () => {
|
|
|
|
|
|
it( 'should remove marker from view if it is removed through marker collection', () => {
|
|
|
model.change( writer => {
|
|
|
- writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ) );
|
|
|
+ writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ), { usingOperation: true } );
|
|
|
} );
|
|
|
|
|
|
// Adding with 'high' priority, because `applyOperation` is decorated - its default callback is fired with 'normal' priority.
|
|
|
@@ -489,8 +490,8 @@ describe( 'EditingController', () => {
|
|
|
expect( getViewData( editing.view, { withoutSelection: true } ) ).to.equal( '<p>foo</p><p>bar</p>' );
|
|
|
}, { priority: 'low' } );
|
|
|
|
|
|
- model.change( () => {
|
|
|
- model.markers.remove( 'marker' );
|
|
|
+ model.change( writer => {
|
|
|
+ writer.removeMarker( 'marker' );
|
|
|
} );
|
|
|
|
|
|
expect( getViewData( editing.view, { withoutSelection: true } ) ).to.equal( '<p>foo</p><p>bar</p>' );
|
|
|
@@ -498,7 +499,7 @@ describe( 'EditingController', () => {
|
|
|
|
|
|
it( 'should not remove marker if applied operation is an attribute operation', () => {
|
|
|
model.change( writer => {
|
|
|
- writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ) );
|
|
|
+ writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ), { usingOperation: true } );
|
|
|
} );
|
|
|
|
|
|
// Adding with 'high' priority, because `applyOperation` is decorated - its default callback is fired with 'normal' priority.
|
|
|
@@ -516,7 +517,7 @@ describe( 'EditingController', () => {
|
|
|
|
|
|
it( 'should not crash if multiple operations affect a marker', () => {
|
|
|
model.change( writer => {
|
|
|
- writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ) );
|
|
|
+ writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ), { usingOperation: true } );
|
|
|
} );
|
|
|
|
|
|
model.change( writer => {
|
|
|
@@ -530,12 +531,12 @@ describe( 'EditingController', () => {
|
|
|
|
|
|
it( 'should not crash if marker is removed, added and removed #1', () => {
|
|
|
model.change( writer => {
|
|
|
- writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ) );
|
|
|
+ writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ), { usingOperation: true } );
|
|
|
} );
|
|
|
|
|
|
model.change( writer => {
|
|
|
writer.insertText( 'a', p1, 0 );
|
|
|
- writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 3, p1, 4 ) );
|
|
|
+ writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 3, p1, 4 ), { usingOperation: true } );
|
|
|
writer.insertText( 'a', p1, 0 );
|
|
|
} );
|
|
|
|
|
|
@@ -544,13 +545,13 @@ describe( 'EditingController', () => {
|
|
|
|
|
|
it( 'should not crash if marker is removed, added and removed #2', () => {
|
|
|
model.change( writer => {
|
|
|
- writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ) );
|
|
|
+ writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 1, p1, 2 ), { usingOperation: true } );
|
|
|
} );
|
|
|
|
|
|
model.change( writer => {
|
|
|
- writer.removeMarker( 'marker' );
|
|
|
- writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 0, p1, 1 ) );
|
|
|
- writer.removeMarker( 'marker' );
|
|
|
+ writer.removeMarker( 'marker', { usingOperation: true } );
|
|
|
+ writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( p1, 0, p1, 1 ), { usingOperation: true } );
|
|
|
+ writer.removeMarker( 'marker', { usingOperation: true } );
|
|
|
} );
|
|
|
|
|
|
expect( getViewData( editing.view, { withoutSelection: true } ) ).to.equal( '<p>foo</p><p>bar</p>' );
|