Merge pull request #92 from ckeditor/t/ckeditor5-enter/40

Other: Mark basic-styles attributes with 'copyOnEnter' property.

Author: jodator

src/bold/boldediting.js

@@ -28,7 +28,10 @@ export default class BoldEditing extends Plugin {
 		const editor = this.editor;
 		// Allow bold attribute on text nodes.
 		editor.model.schema.extend( '$text', { allowAttributes: BOLD } );
-		editor.model.schema.setAttributeProperties( BOLD, { isFormatting: true } );
+		editor.model.schema.setAttributeProperties( BOLD, {
+			isFormatting: true,
+			copyOnEnter: true
+		} );
 
 		// Build converter from model to view for data and editing pipelines.
 

src/code/codeediting.js

@@ -29,7 +29,10 @@ export default class CodeEditing extends Plugin {
 
 		// Allow code attribute on text nodes.
 		editor.model.schema.extend( '$text', { allowAttributes: CODE } );
-		editor.model.schema.setAttributeProperties( CODE, { isFormatting: true } );
+		editor.model.schema.setAttributeProperties( CODE, {
+			isFormatting: true,
+			copyOnEnter: true
+		} );
 
 		editor.conversion.attributeToElement( {
 			model: CODE,

src/italic/italicediting.js

@@ -29,7 +29,10 @@ export default class ItalicEditing extends Plugin {
 
 		// Allow italic attribute on text nodes.
 		editor.model.schema.extend( '$text', { allowAttributes: ITALIC } );
-		editor.model.schema.setAttributeProperties( ITALIC, { isFormatting: true } );
+		editor.model.schema.setAttributeProperties( ITALIC, {
+			isFormatting: true,
+			copyOnEnter: true
+		} );
 
 		editor.conversion.attributeToElement( {
 			model: ITALIC,

src/strikethrough/strikethroughediting.js

@@ -30,7 +30,10 @@ export default class StrikethroughEditing extends Plugin {
 
 		// Allow strikethrough attribute on text nodes.
 		editor.model.schema.extend( '$text', { allowAttributes: STRIKETHROUGH } );
-		editor.model.schema.setAttributeProperties( STRIKETHROUGH, { isFormatting: true } );
+		editor.model.schema.setAttributeProperties( STRIKETHROUGH, {
+			isFormatting: true,
+			copyOnEnter: true
+		} );
 
 		editor.conversion.attributeToElement( {
 			model: STRIKETHROUGH,

src/subscript/subscriptediting.js

@@ -28,7 +28,10 @@ export default class SubscriptEditing extends Plugin {
 		const editor = this.editor;
 		// Allow sub attribute on text nodes.
 		editor.model.schema.extend( '$text', { allowAttributes: SUBSCRIPT } );
-		editor.model.schema.setAttributeProperties( SUBSCRIPT, { isFormatting: true } );
+		editor.model.schema.setAttributeProperties( SUBSCRIPT, {
+			isFormatting: true,
+			copyOnEnter: true
+		} );
 
 		// Build converter from model to view for data and editing pipelines.
 

src/superscript/superscriptediting.js

@@ -28,7 +28,10 @@ export default class SuperscriptEditing extends Plugin {
 		const editor = this.editor;
 		// Allow super attribute on text nodes.
 		editor.model.schema.extend( '$text', { allowAttributes: SUPERSCRIPT } );
-		editor.model.schema.setAttributeProperties( SUPERSCRIPT, { isFormatting: true } );
+		editor.model.schema.setAttributeProperties( SUPERSCRIPT, {
+			isFormatting: true,
+			copyOnEnter: true
+		} );
 
 		// Build converter from model to view for data and editing pipelines.
 

src/underline/underlineediting.js

@@ -29,7 +29,10 @@ export default class UnderlineEditing extends Plugin {
 
 		// Allow strikethrough attribute on text nodes.
 		editor.model.schema.extend( '$text', { allowAttributes: UNDERLINE } );
-		editor.model.schema.setAttributeProperties( UNDERLINE, { isFormatting: true } );
+		editor.model.schema.setAttributeProperties( UNDERLINE, {
+			isFormatting: true,
+			copyOnEnter: true
+		} );
 
 		editor.conversion.attributeToElement( {
 			model: UNDERLINE,

tests/bold/boldediting.js

@@ -41,11 +41,17 @@ describe( 'BoldEditing', () => {
 	} );
 
 	it( 'should be marked with a formatting property', () => {
-		expect( model.schema.getAttributeProperties( 'bold' ) ).to.deep.equal( {
+		expect( model.schema.getAttributeProperties( 'bold' ) ).to.include( {
 			isFormatting: true
 		} );
 	} );
 
+	it( 'its attribute is marked with a copOnEnter property', () => {
+		expect( model.schema.getAttributeProperties( 'bold' ) ).to.include( {
+			copyOnEnter: true
+		} );
+	} );
+
 	it( 'should set editor keystroke', () => {
 		const spy = sinon.spy( editor, 'execute' );
 		const keyEventData = {

tests/code/codeediting.js

@@ -40,11 +40,17 @@ describe( 'CodeEditing', () => {
 	} );
 
 	it( 'should be marked with a formatting property', () => {
-		expect( model.schema.getAttributeProperties( 'code' ) ).to.deep.equal( {
+		expect( model.schema.getAttributeProperties( 'code' ) ).to.include( {
 			isFormatting: true
 		} );
 	} );
 
+	it( 'its attribute is marked with a copOnEnter property', () => {
+		expect( model.schema.getAttributeProperties( 'code' ) ).to.include( {
+			copyOnEnter: true
+		} );
+	} );
+
 	describe( 'command', () => {
 		it( 'should register code command', () => {
 			const command = editor.commands.get( 'code' );

tests/italic/italicediting.js

@@ -40,11 +40,17 @@ describe( 'ItalicEditing', () => {
 	} );
 
 	it( 'should be marked with a formatting property', () => {
-		expect( model.schema.getAttributeProperties( 'italic' ) ).to.deep.equal( {
+		expect( model.schema.getAttributeProperties( 'italic' ) ).to.include( {
 			isFormatting: true
 		} );
 	} );
 
+	it( 'its attribute is marked with a copOnEnter property', () => {
+		expect( model.schema.getAttributeProperties( 'italic' ) ).to.include( {
+			copyOnEnter: true
+		} );
+	} );
+
 	describe( 'command', () => {
 		it( 'should register italic command', () => {
 			const command = editor.commands.get( 'italic' );