|
|
@@ -3,7 +3,7 @@
|
|
|
* For licensing, see LICENSE.md.
|
|
|
*/
|
|
|
|
|
|
-import Document from '../../src/model/document';
|
|
|
+import Model from '../../src/model/model';
|
|
|
import DataController from '../../src/controller/datacontroller';
|
|
|
import insertContent from '../../src/controller/insertcontent';
|
|
|
|
|
|
@@ -13,83 +13,82 @@ import Element from '../../src/model/element';
|
|
|
|
|
|
import { setData, getData, parse } from '../../src/dev-utils/model';
|
|
|
|
|
|
-describe( 'DataController', () => {
|
|
|
- let doc, dataController;
|
|
|
+describe( 'DataController utils', () => {
|
|
|
+ let model, doc, dataController;
|
|
|
|
|
|
describe( 'insertContent', () => {
|
|
|
- it( 'uses the passed batch', () => {
|
|
|
- const doc = new Document();
|
|
|
+ it( 'should use parent batch', () => {
|
|
|
+ model = new Model();
|
|
|
+ doc = model.document;
|
|
|
doc.createRoot();
|
|
|
- doc.schema.allow( { name: '$text', inside: '$root' } );
|
|
|
+ dataController = new DataController( model );
|
|
|
|
|
|
- const dataController = new DataController( doc );
|
|
|
+ model.schema.allow( { name: '$text', inside: '$root' } );
|
|
|
+ setData( model, 'x[]x' );
|
|
|
|
|
|
- const batch = doc.batch();
|
|
|
-
|
|
|
- setData( doc, 'x[]x' );
|
|
|
-
|
|
|
- insertContent( dataController, new DocumentFragment( [ new Text( 'a' ) ] ), doc.selection, batch );
|
|
|
-
|
|
|
- expect( batch.deltas.length ).to.be.above( 0 );
|
|
|
+ model.change( writer => {
|
|
|
+ insertContent( dataController, new Text( 'a' ), doc.selection );
|
|
|
+ expect( writer.batch.deltas ).to.length( 1 );
|
|
|
+ } );
|
|
|
} );
|
|
|
|
|
|
it( 'accepts DocumentFragment', () => {
|
|
|
- const doc = new Document();
|
|
|
- const dataController = new DataController( doc );
|
|
|
- const batch = doc.batch();
|
|
|
-
|
|
|
+ model = new Model();
|
|
|
+ doc = model.document;
|
|
|
doc.createRoot();
|
|
|
- doc.schema.allow( { name: '$text', inside: '$root' } );
|
|
|
+ dataController = new DataController( model );
|
|
|
+
|
|
|
+ model.schema.allow( { name: '$text', inside: '$root' } );
|
|
|
|
|
|
- setData( doc, 'x[]x' );
|
|
|
+ setData( model, 'x[]x' );
|
|
|
|
|
|
- insertContent( dataController, new DocumentFragment( [ new Text( 'a' ) ] ), doc.selection, batch );
|
|
|
+ insertContent( dataController, new DocumentFragment( [ new Text( 'a' ) ] ), doc.selection );
|
|
|
|
|
|
- expect( getData( doc ) ).to.equal( 'xa[]x' );
|
|
|
+ expect( getData( model ) ).to.equal( 'xa[]x' );
|
|
|
} );
|
|
|
|
|
|
it( 'accepts Text', () => {
|
|
|
- const doc = new Document();
|
|
|
- const dataController = new DataController( doc );
|
|
|
- const batch = doc.batch();
|
|
|
-
|
|
|
+ model = new Model();
|
|
|
+ doc = model.document;
|
|
|
doc.createRoot();
|
|
|
- doc.schema.allow( { name: '$text', inside: '$root' } );
|
|
|
+ dataController = new DataController( model );
|
|
|
+
|
|
|
+ model.schema.allow( { name: '$text', inside: '$root' } );
|
|
|
|
|
|
- setData( doc, 'x[]x' );
|
|
|
+ setData( model, 'x[]x' );
|
|
|
|
|
|
- insertContent( dataController, new Text( 'a' ), doc.selection, batch );
|
|
|
+ insertContent( dataController, new Text( 'a' ), doc.selection );
|
|
|
|
|
|
- expect( getData( doc ) ).to.equal( 'xa[]x' );
|
|
|
+ expect( getData( model ) ).to.equal( 'xa[]x' );
|
|
|
} );
|
|
|
|
|
|
it( 'should save the reference to the original object', () => {
|
|
|
- const doc = new Document();
|
|
|
- const dataController = new DataController( doc );
|
|
|
- const batch = doc.batch();
|
|
|
- const content = new Element( 'image' );
|
|
|
-
|
|
|
+ model = new Model();
|
|
|
+ doc = model.document;
|
|
|
doc.createRoot();
|
|
|
+ dataController = new DataController( model );
|
|
|
+
|
|
|
+ const content = new Element( 'image' );
|
|
|
|
|
|
- doc.schema.registerItem( 'paragraph', '$block' );
|
|
|
- doc.schema.registerItem( 'image', '$inline' );
|
|
|
- doc.schema.objects.add( 'image' );
|
|
|
+ model.schema.registerItem( 'paragraph', '$block' );
|
|
|
+ model.schema.registerItem( 'image', '$inline' );
|
|
|
+ model.schema.objects.add( 'image' );
|
|
|
|
|
|
- setData( doc, '<paragraph>foo[]</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo[]</paragraph>' );
|
|
|
|
|
|
- insertContent( dataController, content, doc.selection, batch );
|
|
|
+ insertContent( dataController, content, doc.selection );
|
|
|
|
|
|
expect( doc.getRoot().getChild( 0 ).getChild( 1 ) ).to.equal( content );
|
|
|
} );
|
|
|
|
|
|
describe( 'in simple scenarios', () => {
|
|
|
beforeEach( () => {
|
|
|
- doc = new Document();
|
|
|
+ model = new Model();
|
|
|
+ doc = model.document;
|
|
|
doc.createRoot();
|
|
|
+ dataController = new DataController( model );
|
|
|
|
|
|
- dataController = new DataController( doc );
|
|
|
-
|
|
|
- const schema = doc.schema;
|
|
|
+ const schema = model.schema;
|
|
|
|
|
|
schema.registerItem( 'image', '$inline' );
|
|
|
schema.registerItem( 'disallowedElement' );
|
|
|
@@ -98,7 +97,7 @@ describe( 'DataController', () => {
|
|
|
schema.allow( { name: 'image', inside: '$root' } );
|
|
|
// Otherwise it won't be passed to the temporary model fragment used inside insert().
|
|
|
schema.allow( { name: 'disallowedElement', inside: '$clipboardHolder' } );
|
|
|
- doc.schema.allow( { name: '$text', inside: 'disallowedElement' } );
|
|
|
+ model.schema.allow( { name: '$text', inside: 'disallowedElement' } );
|
|
|
|
|
|
schema.allow( { name: '$inline', attributes: [ 'bold' ] } );
|
|
|
schema.allow( { name: '$inline', attributes: [ 'italic' ] } );
|
|
|
@@ -107,29 +106,29 @@ describe( 'DataController', () => {
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one text node', () => {
|
|
|
- setData( doc, 'f[]oo' );
|
|
|
+ setData( model, 'f[]oo' );
|
|
|
insertHelper( 'xyz' );
|
|
|
- expect( getData( doc ) ).to.equal( 'fxyz[]oo' );
|
|
|
+ expect( getData( model ) ).to.equal( 'fxyz[]oo' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one text node (at the end)', () => {
|
|
|
- setData( doc, 'foo[]' );
|
|
|
+ setData( model, 'foo[]' );
|
|
|
insertHelper( 'xyz' );
|
|
|
- expect( getData( doc ) ).to.equal( 'fooxyz[]' );
|
|
|
+ expect( getData( model ) ).to.equal( 'fooxyz[]' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one text node with attribute', () => {
|
|
|
- setData( doc, 'f[]oo' );
|
|
|
+ setData( model, 'f[]oo' );
|
|
|
insertHelper( '<$text bold="true">xyz</$text>' );
|
|
|
- expect( getData( doc ) ).to.equal( 'f<$text bold="true">xyz[]</$text>oo' );
|
|
|
+ expect( getData( model ) ).to.equal( 'f<$text bold="true">xyz[]</$text>oo' );
|
|
|
|
|
|
expect( doc.selection.getAttribute( 'bold' ) ).to.be.true;
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one text node with attribute into text with a different attribute', () => {
|
|
|
- setData( doc, '<$text bold="true">f[]oo</$text>' );
|
|
|
+ setData( model, '<$text bold="true">f[]oo</$text>' );
|
|
|
insertHelper( '<$text italic="true">xyz</$text>' );
|
|
|
- expect( getData( doc ) )
|
|
|
+ expect( getData( model ) )
|
|
|
.to.equal( '<$text bold="true">f</$text><$text italic="true">xyz[]</$text><$text bold="true">oo</$text>' );
|
|
|
|
|
|
expect( doc.selection.getAttribute( 'italic' ) ).to.be.true;
|
|
|
@@ -137,44 +136,44 @@ describe( 'DataController', () => {
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one text node with attribute into text with the same attribute', () => {
|
|
|
- setData( doc, '<$text bold="true">f[]oo</$text>' );
|
|
|
+ setData( model, '<$text bold="true">f[]oo</$text>' );
|
|
|
insertHelper( '<$text bold="true">xyz</$text>' );
|
|
|
- expect( getData( doc ) )
|
|
|
+ expect( getData( model ) )
|
|
|
.to.equal( '<$text bold="true">fxyz[]oo</$text>' );
|
|
|
|
|
|
expect( doc.selection.getAttribute( 'bold' ) ).to.be.true;
|
|
|
} );
|
|
|
|
|
|
it( 'inserts a text without attributes into a text with an attribute', () => {
|
|
|
- setData( doc, '<$text bold="true">f[]oo</$text>' );
|
|
|
+ setData( model, '<$text bold="true">f[]oo</$text>' );
|
|
|
insertHelper( 'xyz' );
|
|
|
- expect( getData( doc ) ).to.equal( '<$text bold="true">f</$text>xyz[]<$text bold="true">oo</$text>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<$text bold="true">f</$text>xyz[]<$text bold="true">oo</$text>' );
|
|
|
|
|
|
expect( doc.selection.hasAttribute( 'bold' ) ).to.be.false;
|
|
|
} );
|
|
|
|
|
|
it( 'inserts an element', () => {
|
|
|
- setData( doc, 'f[]oo' );
|
|
|
+ setData( model, 'f[]oo' );
|
|
|
insertHelper( '<image></image>' );
|
|
|
- expect( getData( doc ) ).to.equal( 'f<image></image>[]oo' );
|
|
|
+ expect( getData( model ) ).to.equal( 'f<image></image>[]oo' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts a text and an element', () => {
|
|
|
- setData( doc, 'f[]oo' );
|
|
|
+ setData( model, 'f[]oo' );
|
|
|
insertHelper( 'xyz<image></image>' );
|
|
|
- expect( getData( doc ) ).to.equal( 'fxyz<image></image>[]oo' );
|
|
|
+ expect( getData( model ) ).to.equal( 'fxyz<image></image>[]oo' );
|
|
|
} );
|
|
|
|
|
|
it( 'strips a disallowed element', () => {
|
|
|
- setData( doc, 'f[]oo' );
|
|
|
+ setData( model, 'f[]oo' );
|
|
|
insertHelper( '<disallowedElement>xyz</disallowedElement>' );
|
|
|
- expect( getData( doc ) ).to.equal( 'fxyz[]oo' );
|
|
|
+ expect( getData( model ) ).to.equal( 'fxyz[]oo' );
|
|
|
} );
|
|
|
|
|
|
it( 'deletes selection before inserting the content', () => {
|
|
|
- setData( doc, 'f[abc]oo' );
|
|
|
+ setData( model, 'f[abc]oo' );
|
|
|
insertHelper( 'x' );
|
|
|
- expect( getData( doc ) ).to.equal( 'fx[]oo' );
|
|
|
+ expect( getData( model ) ).to.equal( 'fx[]oo' );
|
|
|
} );
|
|
|
|
|
|
describe( 'spaces handling', () => {
|
|
|
@@ -182,45 +181,45 @@ describe( 'DataController', () => {
|
|
|
// inserted into the model as is. The conversion to nbsps happen on view<=>DOM conversion.
|
|
|
|
|
|
it( 'inserts one space', () => {
|
|
|
- setData( doc, 'f[]oo' );
|
|
|
+ setData( model, 'f[]oo' );
|
|
|
insertHelper( new Text( ' ' ) );
|
|
|
- expect( getData( doc ) ).to.equal( 'f []oo' );
|
|
|
+ expect( getData( model ) ).to.equal( 'f []oo' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts three spaces', () => {
|
|
|
- setData( doc, 'f[]oo' );
|
|
|
+ setData( model, 'f[]oo' );
|
|
|
insertHelper( new Text( ' ' ) );
|
|
|
- expect( getData( doc ) ).to.equal( 'f []oo' );
|
|
|
+ expect( getData( model ) ).to.equal( 'f []oo' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts spaces at the end', () => {
|
|
|
- setData( doc, 'foo[]' );
|
|
|
+ setData( model, 'foo[]' );
|
|
|
insertHelper( new Text( ' ' ) );
|
|
|
- expect( getData( doc ) ).to.equal( 'foo []' );
|
|
|
+ expect( getData( model ) ).to.equal( 'foo []' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one nbsp', () => {
|
|
|
- setData( doc, 'f[]oo' );
|
|
|
+ setData( model, 'f[]oo' );
|
|
|
insertHelper( new Text( '\u200a' ) );
|
|
|
- expect( getData( doc ) ).to.equal( 'f\u200a[]oo' );
|
|
|
+ expect( getData( model ) ).to.equal( 'f\u200a[]oo' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts word surrounded by spaces', () => {
|
|
|
- setData( doc, 'f[]oo' );
|
|
|
+ setData( model, 'f[]oo' );
|
|
|
insertHelper( new Text( ' xyz ' ) );
|
|
|
- expect( getData( doc ) ).to.equal( 'f xyz []oo' );
|
|
|
+ expect( getData( model ) ).to.equal( 'f xyz []oo' );
|
|
|
} );
|
|
|
} );
|
|
|
} );
|
|
|
|
|
|
describe( 'in blocks', () => {
|
|
|
beforeEach( () => {
|
|
|
- doc = new Document();
|
|
|
+ model = new Model();
|
|
|
+ doc = model.document;
|
|
|
doc.createRoot();
|
|
|
+ dataController = new DataController( model );
|
|
|
|
|
|
- dataController = new DataController( doc );
|
|
|
-
|
|
|
- const schema = doc.schema;
|
|
|
+ const schema = model.schema;
|
|
|
|
|
|
schema.registerItem( 'paragraph', '$block' );
|
|
|
schema.registerItem( 'heading1', '$block' );
|
|
|
@@ -244,137 +243,137 @@ describe( 'DataController', () => {
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one text node', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( 'xyz' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fxyz[]oo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fxyz[]oo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one text node to fully selected paragraph', () => {
|
|
|
- setData( doc, '<paragraph>[foo]</paragraph>' );
|
|
|
+ setData( model, '<paragraph>[foo]</paragraph>' );
|
|
|
insertHelper( 'xyz' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>xyz[]</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>xyz[]</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one text node to fully selected paragraphs (from outside)', () => {
|
|
|
- setData( doc, '[<paragraph>foo</paragraph><paragraph>bar</paragraph>]' );
|
|
|
+ setData( model, '[<paragraph>foo</paragraph><paragraph>bar</paragraph>]' );
|
|
|
insertHelper( 'xyz' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>xyz[]</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>xyz[]</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'merges two blocks before inserting content (p+p)', () => {
|
|
|
- setData( doc, '<paragraph>fo[o</paragraph><paragraph>b]ar</paragraph>' );
|
|
|
+ setData( model, '<paragraph>fo[o</paragraph><paragraph>b]ar</paragraph>' );
|
|
|
insertHelper( 'xyz' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>foxyz[]ar</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>foxyz[]ar</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts inline widget and text', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( 'xyz<inlineWidget></inlineWidget>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fxyz<inlineWidget></inlineWidget>[]oo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fxyz<inlineWidget></inlineWidget>[]oo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
// Note: In CKEditor 4 the blocks are not merged, but to KISS we're merging here
|
|
|
// because that's what deleteContent() does.
|
|
|
it( 'merges two blocks before inserting content (h+p)', () => {
|
|
|
- setData( doc, '<heading1>fo[o</heading1><paragraph>b]ar</paragraph>' );
|
|
|
+ setData( model, '<heading1>fo[o</heading1><paragraph>b]ar</paragraph>' );
|
|
|
insertHelper( 'xyz' );
|
|
|
- expect( getData( doc ) ).to.equal( '<heading1>foxyz[]ar</heading1>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<heading1>foxyz[]ar</heading1>' );
|
|
|
} );
|
|
|
|
|
|
it( 'not insert autoparagraph when paragraph is disallowed at the current position', () => {
|
|
|
- doc.schema.disallow( { name: 'paragraph', inside: '$root' } );
|
|
|
+ model.schema.disallow( { name: 'paragraph', inside: '$root' } );
|
|
|
|
|
|
const content = new DocumentFragment( [
|
|
|
new Element( 'heading1', [], [ new Text( 'bar' ) ] ),
|
|
|
new Text( 'biz' )
|
|
|
] );
|
|
|
|
|
|
- setData( doc, '[<heading2>foo</heading2>]' );
|
|
|
+ setData( model, '[<heading2>foo</heading2>]' );
|
|
|
insertContent( dataController, content, doc.selection );
|
|
|
- expect( getData( doc ) ).to.equal( '<heading1>bar[]</heading1>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<heading1>bar[]</heading1>' );
|
|
|
} );
|
|
|
|
|
|
describe( 'block to block handling', () => {
|
|
|
it( 'inserts one paragraph', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<paragraph>xyz</paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fxyz[]oo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fxyz[]oo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one paragraph (at the end)', () => {
|
|
|
- setData( doc, '<paragraph>foo[]</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo[]</paragraph>' );
|
|
|
insertHelper( '<paragraph>xyz</paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fooxyz[]</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fooxyz[]</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one paragraph into an empty paragraph', () => {
|
|
|
- setData( doc, '<paragraph>[]</paragraph>' );
|
|
|
+ setData( model, '<paragraph>[]</paragraph>' );
|
|
|
insertHelper( '<paragraph>xyz</paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>xyz[]</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>xyz[]</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one empty paragraph', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<paragraph></paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>f[]oo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>f[]oo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one block into a fully selected content', () => {
|
|
|
- setData( doc, '<heading1>[foo</heading1><paragraph>bar]</paragraph>' );
|
|
|
+ setData( model, '<heading1>[foo</heading1><paragraph>bar]</paragraph>' );
|
|
|
insertHelper( '<heading2>xyz</heading2>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<heading2>xyz[]</heading2>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<heading2>xyz[]</heading2>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one heading', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<heading1>xyz</heading1>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fxyz[]oo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fxyz[]oo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts two headings', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<heading1>xxx</heading1><heading1>yyy</heading1>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fxxx</paragraph><heading1>yyy[]oo</heading1>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fxxx</paragraph><heading1>yyy[]oo</heading1>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one object', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<blockWidget></blockWidget>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>f</paragraph>[<blockWidget></blockWidget>]<paragraph>oo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>f</paragraph>[<blockWidget></blockWidget>]<paragraph>oo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one object (at the end)', () => {
|
|
|
- setData( doc, '<paragraph>foo[]</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo[]</paragraph>' );
|
|
|
insertHelper( '<blockWidget></blockWidget>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>foo</paragraph>[<blockWidget></blockWidget>]' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>foo</paragraph>[<blockWidget></blockWidget>]' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one object (at the beginning)', () => {
|
|
|
- setData( doc, '<paragraph>[]bar</paragraph>' );
|
|
|
+ setData( model, '<paragraph>[]bar</paragraph>' );
|
|
|
insertHelper( '<blockWidget></blockWidget>' );
|
|
|
- expect( getData( doc ) ).to.equal( '[<blockWidget></blockWidget>]<paragraph>bar</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '[<blockWidget></blockWidget>]<paragraph>bar</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts one list item', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<listItem indent="0" type="bulleted">xyz</listItem>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fxyz[]oo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fxyz[]oo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts list item to empty element', () => {
|
|
|
- setData( doc, '<paragraph>[]</paragraph>' );
|
|
|
+ setData( model, '<paragraph>[]</paragraph>' );
|
|
|
insertHelper( '<listItem indent="0" type="bulleted">xyz</listItem>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<listItem indent="0" type="bulleted">xyz[]</listItem>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<listItem indent="0" type="bulleted">xyz[]</listItem>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts three list items at the end of paragraph', () => {
|
|
|
- setData( doc, '<paragraph>foo[]</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo[]</paragraph>' );
|
|
|
insertHelper(
|
|
|
'<listItem indent="0" type="bulleted">xxx</listItem>' +
|
|
|
'<listItem indent="0" type="bulleted">yyy</listItem>' +
|
|
|
'<listItem indent="0" type="bulleted">zzz</listItem>'
|
|
|
);
|
|
|
- expect( getData( doc ) ).to.equal(
|
|
|
+ expect( getData( model ) ).to.equal(
|
|
|
'<paragraph>fooxxx</paragraph>' +
|
|
|
'<listItem indent="0" type="bulleted">yyy</listItem>' +
|
|
|
'<listItem indent="0" type="bulleted">zzz[]</listItem>'
|
|
|
@@ -382,12 +381,12 @@ describe( 'DataController', () => {
|
|
|
} );
|
|
|
|
|
|
it( 'inserts two list items to an empty paragraph', () => {
|
|
|
- setData( doc, '<paragraph>a</paragraph><paragraph>[]</paragraph><paragraph>b</paragraph>' );
|
|
|
+ setData( model, '<paragraph>a</paragraph><paragraph>[]</paragraph><paragraph>b</paragraph>' );
|
|
|
insertHelper(
|
|
|
'<listItem indent="0" type="bulleted">xxx</listItem>' +
|
|
|
'<listItem indent="0" type="bulleted">yyy</listItem>'
|
|
|
);
|
|
|
- expect( getData( doc ) ).to.equal(
|
|
|
+ expect( getData( model ) ).to.equal(
|
|
|
'<paragraph>a</paragraph>' +
|
|
|
'<listItem indent="0" type="bulleted">xxx</listItem>' +
|
|
|
'<listItem indent="0" type="bulleted">yyy[]</listItem>' +
|
|
|
@@ -398,51 +397,51 @@ describe( 'DataController', () => {
|
|
|
|
|
|
describe( 'mixed content to block', () => {
|
|
|
it( 'inserts text + paragraph', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( 'xxx<paragraph>yyy</paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fxxx</paragraph><paragraph>yyy[]oo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fxxx</paragraph><paragraph>yyy[]oo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts text + inlineWidget + text + paragraph', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( 'xxx<inlineWidget></inlineWidget>yyy<paragraph>zzz</paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal(
|
|
|
+ expect( getData( model ) ).to.equal(
|
|
|
'<paragraph>fxxx<inlineWidget></inlineWidget>yyy</paragraph><paragraph>zzz[]oo</paragraph>'
|
|
|
);
|
|
|
} );
|
|
|
|
|
|
it( 'inserts text + paragraph (at the beginning)', () => {
|
|
|
- setData( doc, '<paragraph>[]foo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>[]foo</paragraph>' );
|
|
|
insertHelper( 'xxx<paragraph>yyy</paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>xxx</paragraph><paragraph>yyy[]foo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>xxx</paragraph><paragraph>yyy[]foo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts text + paragraph (at the end)', () => {
|
|
|
- setData( doc, '<paragraph>foo[]</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo[]</paragraph>' );
|
|
|
insertHelper( 'xxx<paragraph>yyy</paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fooxxx</paragraph><paragraph>yyy[]</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fooxxx</paragraph><paragraph>yyy[]</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts paragraph + text', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<paragraph>yyy</paragraph>xxx' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fyyy</paragraph><paragraph>xxx[]oo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fyyy</paragraph><paragraph>xxx[]oo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
// This is the expected result, but it was so hard to achieve at this stage that I
|
|
|
// decided to go with the what the next test represents.
|
|
|
// it( 'inserts paragraph + text + inlineWidget + text', () => {
|
|
|
- // setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ // setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
// insertHelper( '<paragraph>yyy</paragraph>xxx<inlineWidget></inlineWidget>zzz' );
|
|
|
- // expect( getData( doc ) )
|
|
|
+ // expect( getData( model ) )
|
|
|
// .to.equal( '<paragraph>fyyy</paragraph><paragraph>xxx<inlineWidget></inlineWidget>zzz[]oo</paragraph>' );
|
|
|
// } );
|
|
|
|
|
|
// See the comment above.
|
|
|
it( 'inserts paragraph + text + inlineWidget + text', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<paragraph>yyy</paragraph>xxx<inlineWidget></inlineWidget>zzz' );
|
|
|
- expect( getData( doc ) ).to.equal(
|
|
|
+ expect( getData( model ) ).to.equal(
|
|
|
'<paragraph>fyyy</paragraph><paragraph>xxx</paragraph>' +
|
|
|
'<paragraph><inlineWidget></inlineWidget></paragraph>' +
|
|
|
'<paragraph>zzz[]oo</paragraph>'
|
|
|
@@ -450,43 +449,43 @@ describe( 'DataController', () => {
|
|
|
} );
|
|
|
|
|
|
it( 'inserts paragraph + text + paragraph', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<paragraph>yyy</paragraph>xxx<paragraph>zzz</paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal(
|
|
|
+ expect( getData( model ) ).to.equal(
|
|
|
'<paragraph>fyyy</paragraph><paragraph>xxx</paragraph><paragraph>zzz[]oo</paragraph>'
|
|
|
);
|
|
|
} );
|
|
|
|
|
|
it( 'inserts paragraph + text (at the beginning)', () => {
|
|
|
- setData( doc, '<paragraph>[]foo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>[]foo</paragraph>' );
|
|
|
insertHelper( '<paragraph>yyy</paragraph>xxx' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>yyy</paragraph><paragraph>xxx[]foo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>yyy</paragraph><paragraph>xxx[]foo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts paragraph + text (at the end)', () => {
|
|
|
- setData( doc, '<paragraph>foo[]</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo[]</paragraph>' );
|
|
|
insertHelper( '<paragraph>yyy</paragraph>xxx' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fooyyy</paragraph><paragraph>xxx[]</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fooyyy</paragraph><paragraph>xxx[]</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts text + heading', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( 'xxx<heading1>yyy</heading1>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fxxx</paragraph><heading1>yyy[]oo</heading1>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fxxx</paragraph><heading1>yyy[]oo</heading1>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts paragraph + object', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<paragraph>xxx</paragraph><blockWidget></blockWidget>' );
|
|
|
- expect( getData( doc ) ).to.equal(
|
|
|
+ expect( getData( model ) ).to.equal(
|
|
|
'<paragraph>fxxx</paragraph>[<blockWidget></blockWidget>]<paragraph>oo</paragraph>'
|
|
|
);
|
|
|
} );
|
|
|
|
|
|
it( 'inserts object + paragraph', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<blockWidget></blockWidget><paragraph>xxx</paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal(
|
|
|
+ expect( getData( model ) ).to.equal(
|
|
|
'<paragraph>f</paragraph><blockWidget></blockWidget><paragraph>xxx[]oo</paragraph>'
|
|
|
);
|
|
|
} );
|
|
|
@@ -494,50 +493,51 @@ describe( 'DataController', () => {
|
|
|
|
|
|
describe( 'content over a block object', () => {
|
|
|
it( 'inserts text', () => {
|
|
|
- setData( doc, '<paragraph>foo</paragraph>[<blockWidget></blockWidget>]<paragraph>bar</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo</paragraph>[<blockWidget></blockWidget>]<paragraph>bar</paragraph>' );
|
|
|
insertHelper( 'xxx' );
|
|
|
- expect( getData( doc ) ).to.equal(
|
|
|
+ expect( getData( model ) ).to.equal(
|
|
|
'<paragraph>foo</paragraph><paragraph>xxx[]</paragraph><paragraph>bar</paragraph>'
|
|
|
);
|
|
|
} );
|
|
|
|
|
|
it( 'inserts paragraph', () => {
|
|
|
- setData( doc, '<paragraph>foo</paragraph>[<blockWidget></blockWidget>]<paragraph>bar</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo</paragraph>[<blockWidget></blockWidget>]<paragraph>bar</paragraph>' );
|
|
|
insertHelper( '<paragraph>xxx</paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>foo</paragraph><paragraph>xxx[]</paragraph><paragraph>bar</paragraph>' );
|
|
|
+ expect( getData( model ) )
|
|
|
+ .to.equal( '<paragraph>foo</paragraph><paragraph>xxx[]</paragraph><paragraph>bar</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts text + paragraph', () => {
|
|
|
- setData( doc, '<paragraph>foo</paragraph>[<blockWidget></blockWidget>]<paragraph>bar</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo</paragraph>[<blockWidget></blockWidget>]<paragraph>bar</paragraph>' );
|
|
|
insertHelper( 'yyy<paragraph>xxx</paragraph>' );
|
|
|
- expect( getData( doc ) )
|
|
|
+ expect( getData( model ) )
|
|
|
.to.equal(
|
|
|
'<paragraph>foo</paragraph><paragraph>yyy</paragraph><paragraph>xxx[]</paragraph><paragraph>bar</paragraph>'
|
|
|
);
|
|
|
} );
|
|
|
|
|
|
it( 'inserts two blocks', () => {
|
|
|
- setData( doc, '<paragraph>foo</paragraph>[<blockWidget></blockWidget>]<paragraph>bar</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo</paragraph>[<blockWidget></blockWidget>]<paragraph>bar</paragraph>' );
|
|
|
insertHelper( '<heading1>xxx</heading1><paragraph>yyy</paragraph>' );
|
|
|
- expect( getData( doc ) )
|
|
|
+ expect( getData( model ) )
|
|
|
.to.equal(
|
|
|
'<paragraph>foo</paragraph><heading1>xxx</heading1><paragraph>yyy[]</paragraph><paragraph>bar</paragraph>'
|
|
|
);
|
|
|
} );
|
|
|
|
|
|
it( 'inserts block object', () => {
|
|
|
- setData( doc, '<paragraph>foo</paragraph>[<blockWidget></blockWidget>]<paragraph>bar</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo</paragraph>[<blockWidget></blockWidget>]<paragraph>bar</paragraph>' );
|
|
|
insertHelper( '<blockWidget></blockWidget>' );
|
|
|
// It's enough, don't worry.
|
|
|
- expect( getData( doc ) ).to.equal(
|
|
|
+ expect( getData( model ) ).to.equal(
|
|
|
'<paragraph>foo</paragraph>[<blockWidget></blockWidget>]<paragraph>bar</paragraph>'
|
|
|
);
|
|
|
} );
|
|
|
|
|
|
it( 'inserts inline object', () => {
|
|
|
- setData( doc, '<paragraph>foo</paragraph>[<blockWidget></blockWidget>]<paragraph>bar</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo</paragraph>[<blockWidget></blockWidget>]<paragraph>bar</paragraph>' );
|
|
|
insertHelper( '<inlineWidget></inlineWidget>' );
|
|
|
- expect( getData( doc ) )
|
|
|
+ expect( getData( model ) )
|
|
|
.to.equal(
|
|
|
'<paragraph>foo</paragraph><paragraph><inlineWidget></inlineWidget>[]</paragraph><paragraph>bar</paragraph>'
|
|
|
);
|
|
|
@@ -546,39 +546,39 @@ describe( 'DataController', () => {
|
|
|
|
|
|
describe( 'content over an inline object', () => {
|
|
|
it( 'inserts text', () => {
|
|
|
- setData( doc, '<paragraph>foo[<inlineWidget></inlineWidget>]bar</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo[<inlineWidget></inlineWidget>]bar</paragraph>' );
|
|
|
insertHelper( 'xxx' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fooxxx[]bar</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fooxxx[]bar</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts paragraph', () => {
|
|
|
- setData( doc, '<paragraph>foo[<inlineWidget></inlineWidget>]bar</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo[<inlineWidget></inlineWidget>]bar</paragraph>' );
|
|
|
insertHelper( '<paragraph>xxx</paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fooxxx[]bar</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fooxxx[]bar</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts text + paragraph', () => {
|
|
|
- setData( doc, '<paragraph>foo[<inlineWidget></inlineWidget>]bar</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo[<inlineWidget></inlineWidget>]bar</paragraph>' );
|
|
|
insertHelper( 'yyy<paragraph>xxx</paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fooyyy</paragraph><paragraph>xxx[]bar</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fooyyy</paragraph><paragraph>xxx[]bar</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts two blocks', () => {
|
|
|
- setData( doc, '<paragraph>foo[<inlineWidget></inlineWidget>]bar</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo[<inlineWidget></inlineWidget>]bar</paragraph>' );
|
|
|
insertHelper( '<heading1>xxx</heading1><paragraph>yyy</paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fooxxx</paragraph><paragraph>yyy[]bar</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fooxxx</paragraph><paragraph>yyy[]bar</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts inline object', () => {
|
|
|
- setData( doc, '<paragraph>foo[<inlineWidget></inlineWidget>]bar</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo[<inlineWidget></inlineWidget>]bar</paragraph>' );
|
|
|
insertHelper( '<inlineWidget></inlineWidget>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>foo<inlineWidget></inlineWidget>[]bar</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>foo<inlineWidget></inlineWidget>[]bar</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'inserts block object', () => {
|
|
|
- setData( doc, '<paragraph>foo[<inlineWidget></inlineWidget>]bar</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo[<inlineWidget></inlineWidget>]bar</paragraph>' );
|
|
|
insertHelper( '<blockWidget></blockWidget>' );
|
|
|
- expect( getData( doc ) ).to.equal(
|
|
|
+ expect( getData( model ) ).to.equal(
|
|
|
'<paragraph>foo</paragraph>[<blockWidget></blockWidget>]<paragraph>bar</paragraph>'
|
|
|
);
|
|
|
} );
|
|
|
@@ -587,12 +587,12 @@ describe( 'DataController', () => {
|
|
|
|
|
|
describe( 'filtering out', () => {
|
|
|
beforeEach( () => {
|
|
|
- doc = new Document();
|
|
|
+ model = new Model();
|
|
|
+ doc = model.document;
|
|
|
doc.createRoot();
|
|
|
+ dataController = new DataController( model );
|
|
|
|
|
|
- dataController = new DataController( doc );
|
|
|
-
|
|
|
- const schema = doc.schema;
|
|
|
+ const schema = model.schema;
|
|
|
|
|
|
schema.registerItem( 'paragraph', '$block' );
|
|
|
schema.registerItem( 'heading1', '$block' );
|
|
|
@@ -624,80 +624,82 @@ describe( 'DataController', () => {
|
|
|
} );
|
|
|
|
|
|
it( 'filters out disallowed elements and leaves out the text', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<table><td>xxx</td><td>yyy</td></table>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fxxxyyy[]oo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fxxxyyy[]oo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'filters out disallowed elements and leaves out the paragraphs', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<table><td><paragraph>xxx</paragraph><paragraph>yyy</paragraph><paragraph>zzz</paragraph></td></table>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fxxx</paragraph><paragraph>yyy</paragraph><paragraph>zzz[]oo</paragraph>' );
|
|
|
+ expect( getData( model ) )
|
|
|
+ .to.equal( '<paragraph>fxxx</paragraph><paragraph>yyy</paragraph><paragraph>zzz[]oo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'filters out disallowed objects', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<disallowedWidget>xxx</disallowedWidget>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>f[]oo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>f[]oo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'filters out disallowed attributes when inserting text', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( 'x<$text a="1" b="1">x</$text>xy<$text a="1">y</$text>y' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fx<$text b="1">x</$text>xyyy[]oo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fx<$text b="1">x</$text>xyyy[]oo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'filters out disallowed attributes when inserting nested elements', () => {
|
|
|
- setData( doc, '<element>[]</element>' );
|
|
|
+ setData( model, '<element>[]</element>' );
|
|
|
insertHelper( '<table><td>f<$text a="1" b="1" c="1">o</$text>o</td></table>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<element><table><td>f<$text b="1">o</$text>o</td></table>[]</element>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<element><table><td>f<$text b="1">o</$text>o</td></table>[]</element>' );
|
|
|
} );
|
|
|
|
|
|
it( 'filters out disallowed attributes when inserting text in disallowed elements', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<table><td>x<$text a="1" b="1">x</$text>x</td><td>y<$text a="1">y</$text>y</td></table>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fx<$text b="1">x</$text>xyyy[]oo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fx<$text b="1">x</$text>xyyy[]oo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'filters out disallowed attributes when merging #1', () => {
|
|
|
- setData( doc, '<paragraph>[]foo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>[]foo</paragraph>' );
|
|
|
insertHelper( '<paragraph>x<$text a="1" b="1">x</$text>x</paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>x<$text b="1">x</$text>x[]foo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>x<$text b="1">x</$text>x[]foo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'filters out disallowed attributes when merging #2', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<paragraph>x<$text a="1" b="1">x</$text>x</paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fx<$text b="1">x</$text>x[]oo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fx<$text b="1">x</$text>x[]oo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'filters out disallowed attributes when merging #3', () => {
|
|
|
- setData( doc, '<paragraph>foo[]</paragraph>' );
|
|
|
+ setData( model, '<paragraph>foo[]</paragraph>' );
|
|
|
insertHelper( '<paragraph>x<$text a="1" b="1">x</$text>x</paragraph>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>foox<$text b="1">x</$text>x[]</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>foox<$text b="1">x</$text>x[]</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'filters out disallowed attributes from nested nodes when merging', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<heading1>x<element>b<$text a="1" b="1">a</$text>r</element>x</heading1>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fx<element>b<$text b="1">a</$text>r</element>x[]oo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fx<element>b<$text b="1">a</$text>r</element>x[]oo</paragraph>' );
|
|
|
} );
|
|
|
|
|
|
it( 'filters out disallowed attributes when autoparagraphing', () => {
|
|
|
- setData( doc, '<paragraph>f[]oo</paragraph>' );
|
|
|
+ setData( model, '<paragraph>f[]oo</paragraph>' );
|
|
|
insertHelper( '<paragraph>xxx</paragraph><$text a="1" b="1">yyy</$text>' );
|
|
|
- expect( getData( doc ) ).to.equal( '<paragraph>fxxx</paragraph><paragraph><$text b="1">yyy[]</$text>oo</paragraph>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<paragraph>fxxx</paragraph><paragraph><$text b="1">yyy[]</$text>oo</paragraph>' );
|
|
|
} );
|
|
|
} );
|
|
|
} );
|
|
|
|
|
|
describe( 'integration with limit elements', () => {
|
|
|
beforeEach( () => {
|
|
|
- doc = new Document();
|
|
|
+ model = new Model();
|
|
|
+ doc = model.document;
|
|
|
doc.createRoot();
|
|
|
- dataController = new DataController( doc );
|
|
|
+ dataController = new DataController( model );
|
|
|
|
|
|
- const schema = doc.schema;
|
|
|
+ const schema = model.schema;
|
|
|
|
|
|
schema.registerItem( 'limit' );
|
|
|
schema.allow( { name: 'limit', inside: '$root' } );
|
|
|
@@ -713,42 +715,42 @@ describe( 'DataController', () => {
|
|
|
it( 'should insert limit element', () => {
|
|
|
insertHelper( '<limit></limit>' );
|
|
|
|
|
|
- expect( getData( doc ) ).to.equal( '<limit>[]</limit>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<limit>[]</limit>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should insert text into limit element', () => {
|
|
|
- setData( doc, '<limit>[]</limit>' );
|
|
|
+ setData( model, '<limit>[]</limit>' );
|
|
|
insertHelper( 'foo bar' );
|
|
|
|
|
|
- expect( getData( doc ) ).to.equal( '<limit>foo bar[]</limit>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<limit>foo bar[]</limit>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should insert text into limit element', () => {
|
|
|
- setData( doc, '<limit>foo[</limit><limit>]bar</limit>' );
|
|
|
+ setData( model, '<limit>foo[</limit><limit>]bar</limit>' );
|
|
|
insertHelper( 'baz' );
|
|
|
|
|
|
- expect( getData( doc ) ).to.equal( '<limit>foobaz[]</limit><limit>bar</limit>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<limit>foobaz[]</limit><limit>bar</limit>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should not insert disallowed elements inside limit elements', () => {
|
|
|
- setData( doc, '<limit>[]</limit>' );
|
|
|
+ setData( model, '<limit>[]</limit>' );
|
|
|
insertHelper( '<disallowedElement></disallowedElement>' );
|
|
|
|
|
|
- expect( getData( doc ) ).to.equal( '<limit>[]</limit>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<limit>[]</limit>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should not leave the limit element when inserting at the end', () => {
|
|
|
- setData( doc, '<limit>foo[]</limit>' );
|
|
|
+ setData( model, '<limit>foo[]</limit>' );
|
|
|
insertHelper( '<paragraph>a</paragraph><paragraph>b</paragraph>' );
|
|
|
|
|
|
- expect( getData( doc ) ).to.equal( '<limit>fooab[]</limit>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<limit>fooab[]</limit>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should not leave the limit element when inserting at the beginning', () => {
|
|
|
- setData( doc, '<limit>[]foo</limit>' );
|
|
|
+ setData( model, '<limit>[]foo</limit>' );
|
|
|
insertHelper( '<paragraph>a</paragraph><paragraph>b</paragraph>' );
|
|
|
|
|
|
- expect( getData( doc ) ).to.equal( '<limit>ab[]foo</limit>' );
|
|
|
+ expect( getData( model ) ).to.equal( '<limit>ab[]foo</limit>' );
|
|
|
} );
|
|
|
} );
|
|
|
|
|
|
@@ -756,14 +758,12 @@ describe( 'DataController', () => {
|
|
|
//
|
|
|
// @param {module:engine/model/item~Item|String} content
|
|
|
function insertHelper( content ) {
|
|
|
- const batch = doc.batch();
|
|
|
-
|
|
|
if ( typeof content == 'string' ) {
|
|
|
- content = parse( content, doc.schema, batch, {
|
|
|
+ content = parse( content, model.schema, {
|
|
|
context: [ '$clipboardHolder' ]
|
|
|
} );
|
|
|
}
|
|
|
|
|
|
- insertContent( dataController, content, doc.selection, batch );
|
|
|
+ insertContent( dataController, content, doc.selection );
|
|
|
}
|
|
|
} );
|