浏览代码

Code refactoring in Template class.

Aleksander Nowodzinski 10 年之前
父节点
当前提交
365cb791e6
共有 2 个文件被更改,包括 5 次插入13 次删除
  1. 5 9
      packages/ckeditor5-engine/src/ui/template.js
  2. 0 4
      packages/ckeditor5-engine/tests/ui/template.js

+ 5 - 9
packages/ckeditor5-engine/src/ui/template.js

@@ -49,7 +49,10 @@ export default class Template {
 	 * @returns {HTMLElement} A rendered Node.
 	 */
 	_renderNode( def, intoFragment ) {
-		if ( !def ) {
+		const isText = def.text || typeof def == 'string';
+
+		// !XOR( def.tag, isText )
+		if ( def.tag ? isText : !isText ) {
 			/**
 			 * Node definition must have either "tag" or "text" property.
 			 *
@@ -58,19 +61,12 @@ export default class Template {
 			throw new CKEditorError( 'ui-template-wrong-syntax' );
 		}
 
-		const isText = def.text || typeof def == 'string';
-
-		// !XOR( def.tag, isText )
-		if ( ( def.tag ? isText : !isText ) ) {
-			throw new CKEditorError( 'ui-template-wrong-syntax' );
-		}
-
 		return isText ?
 			this._renderText( def ) : this._renderElement( def, intoFragment );
 	}
 
 	/**
-	 * Renders a HTMLElement from TemplateDefinition.
+	 * Renders an HTMLElement from TemplateDefinition.
 	 *
 	 * @protected
 	 * @param {TemplateDefinition} def Definition of an element.

+ 0 - 4
packages/ckeditor5-engine/tests/ui/template.js

@@ -27,10 +27,6 @@ describe( 'Template', () => {
 
 	describe( 'render', () => {
 		it( 'throws when wrong template definition', () => {
-			expect( () => {
-				new Template().render();
-			} ).to.throw( CKEditorError, /ui-template-wrong-syntax/ );
-
 			expect( () => {
 				new Template( {} ).render();
 			} ).to.throw( CKEditorError, /ui-template-wrong-syntax/ );