瀏覽代碼

Code refactroing, removed dead code branches.

Aleksander Nowodzinski 9 年之前
父節點
當前提交
8e074d4617
共有 2 個文件被更改,包括 16 次插入15 次删除
  1. 2 15
      packages/ckeditor5-ui/src/template.js
  2. 14 0
      packages/ckeditor5-ui/tests/template.js

+ 2 - 15
packages/ckeditor5-ui/src/template.js

@@ -844,17 +844,8 @@ function extendObjectValueArray( obj, ext ) {
  * @private
  * @param {ui.TemplateDefinition} def A base template definition.
  * @param {ui.TemplateDefinition} extDef An extension to existing definition.
- * @param {Array} [defSiblings] An array `def` belongs to.
  */
-function extendTemplateDefinition( def, extDef, defSiblings ) {
-	if ( !def ) {
-		defSiblings.push( def = {} );
-	}
-
-	if ( extDef.tag && !def.tag ) {
-		def.tag = extDef.tag;
-	}
-
+function extendTemplateDefinition( def, extDef ) {
 	if ( extDef.attributes ) {
 		if ( !def.attributes ) {
 			def.attributes = {};
@@ -872,10 +863,6 @@ function extendTemplateDefinition( def, extDef, defSiblings ) {
 	}
 
 	if ( extDef.text ) {
-		if ( !def.text ) {
-			def.text = [];
-		}
-
 		def.text.push( ...extDef.text );
 	}
 
@@ -890,7 +877,7 @@ function extendTemplateDefinition( def, extDef, defSiblings ) {
 		}
 
 		extDef.children.forEach( ( extChildDef, index ) => {
-			extendTemplateDefinition( def.children[ index ], extChildDef, def.children );
+			extendTemplateDefinition( def.children[ index ], extChildDef );
 		} );
 	}
 }

+ 14 - 0
packages/ckeditor5-ui/tests/template.js

@@ -1214,6 +1214,20 @@ describe( 'Template', () => {
 				expect( el.outerHTML ).to.equal( '<p a="b abc c def"></p>' );
 			} );
 
+			it( 'creates new - no attributes', () => {
+				extensionTest(
+					{
+						tag: 'p',
+					},
+					{
+						attributes: {
+							c: 'd'
+						}
+					},
+					'<p c="d"></p>'
+				);
+			} );
+
 			it( 'creates new - simple', () => {
 				extensionTest(
 					{