Merge branch 'master' into t/ckeditor5/645

ckeditor · Feb 2, 2018 · 9e85ec4 · 9e85ec4
2 parents 35216d4 + 3175a64
commit 9e85ec4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/template.js b/src/template.js
@@ -16,7 +16,7 @@ import View from './view';
 import ViewCollection from './viewcollection';
 import cloneDeepWith from '@ckeditor/ckeditor5-utils/src/lib/lodash/cloneDeepWith';
 import isObject from '@ckeditor/ckeditor5-utils/src/lib/lodash/isObject';
-import isDomNode from '@ckeditor/ckeditor5-utils/src/dom/isdomnode';
+import isNode from '@ckeditor/ckeditor5-utils/src/dom/isnode';
 import log from '@ckeditor/ckeditor5-utils/src/log';
 
 const xhtmlNs = 'http://www.w3.org/1999/xhtml';
@@ -703,7 +703,7 @@ export default class Template {
 
 					container.appendChild( child.element );
 				}
-			} else if ( isDomNode( child ) ) {
+			} else if ( isNode( child ) ) {
 				container.appendChild( child );
 			} else {
 				if ( isApplying ) {
@@ -1177,7 +1177,7 @@ function normalize( def ) {
 				children.push( def.children );
 			} else {
 				for ( const child of def.children ) {
-					if ( isTemplate( child ) || isView( child ) || isDomNode( child ) ) {
+					if ( isTemplate( child ) || isView( child ) || isNode( child ) ) {
 						children.push( child );
 					} else {
 						children.push( new Template( child ) );