WIP

ckeditor · Dec 21, 2017 · fa4ad03 · fa4ad03
1 parent 2bb8c02
commit fa4ad03
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/src/model/schema2.js b/src/model/schema2.js
@@ -189,9 +189,15 @@ function compileAllowWhere( compiledRules, itemName ) {
 }
 
 function compileAllowAttributesOf( compiledRules, itemName ) {
-	// for ( const allowAttributeOfItem of compiledRules[ itemName ].allowAttributesOf ) {
-	// 	const inheritFrom = compiledRules[ allowAttributeOfItem ];
-	// }
+	for ( const allowAttributeOfItem of compiledRules[ itemName ].allowAttributesOf ) {
+		const inheritFrom = compiledRules[ allowAttributeOfItem ];
+
+		if ( inheritFrom ) {
+			const inheritAttributes = inheritFrom.allowAttributes;
+
+			compiledRules[ itemName ].allowAttributes.push( ...inheritAttributes );
+		}
+	}
 
 	delete compiledRules[ itemName ].allowAttributesOf;
 }

diff --git a/tests/model/schema/schema2.js b/tests/model/schema/schema2.js
@@ -173,6 +173,24 @@ describe( 'Schema', () => {
 				allowAttributes: [ 'foo' ]
 			} );
 		} );
+
+		it( 'ensures no duplicates in allowAttributes duplicated by allowAttributesOf', () => {
+			schema.register( 'paragraph', {
+				allowAttributes: 'foo',
+				allowAttributesOf: '$block'
+			} );
+			schema.register( '$block', {
+				allowAttributes: 'foo'
+			} );
+
+			const rules = schema.getRules();
+
+			expect( rules.paragraph ).to.deep.equal( {
+				name: 'paragraph',
+				allowIn: [],
+				allowAttributes: [ 'foo' ]
+			} );
+		} );
 	} );
 
 	describe( 'checkChild()', () => {