Merge pull request #1698 from ckeditor/t/1697

Fix: Markers should be now correctly upcasted inside any element. Closes #1697.

src/model/model.js

@@ -103,12 +103,15 @@ export default class Model {
 		} );
 		this.schema.extend( '$text', { allowIn: '$clipboardHolder' } );
 
-		// Element needed by `upcastElementToMarker` converter.
-		// This element temporarily represents marker bound during conversion process and is removed
-		// at the end of conversion. `UpcastDispatcher` or at least `Conversion` class looks like a better for this
-		// registration but both know nothing about Schema.
-		this.schema.register( '$marker', {
-			allowIn: [ '$root', '$block' ]
+		// An element needed by the `upcastElementToMarker` converter.
+		// This element temporarily represents a marker boundary during the conversion process and is removed
+		// at the end of the conversion. `UpcastDispatcher` or at least `Conversion` class looks like a
+		// better place for this registration but both know nothing about `Schema`.
+		this.schema.register( '$marker' );
+		this.schema.addChildCheck( ( context, childDefinition ) => {
+			if ( childDefinition.name === '$marker' ) {
+				return true;
+			}
 		} );
 
 		injectSelectionPostFixer( this );

tests/model/model.js

@@ -51,9 +51,14 @@ describe( 'Model', () => {
 		} );
 
 		it( 'registers $marker to the schema', () => {
+			model.document.createRoot( '$anywhere', 'anywhere' );
+			schema.register( 'anything' );
+
 			expect( schema.isRegistered( '$marker' ) ).to.be.true;
-			expect( schema.checkChild( [ '$root' ], '$marker' ), 1 ).to.be.true;
-			expect( schema.checkChild( [ '$block' ], '$marker' ), 1 ).to.be.true;
+			expect( schema.checkChild( [ '$root' ], '$marker' ) ).to.be.true;
+			expect( schema.checkChild( [ '$block' ], '$marker' ) ).to.be.true;
+			expect( schema.checkChild( [ '$anywhere' ], '$marker' ) ).to.be.true;
+			expect( schema.checkChild( [ 'anything' ], '$marker' ) ).to.be.true;
 		} );
 	} );