Sfoglia il codice sorgente

Merge branch 'master' into t/ckeditor5/645

Piotrek Koszuliński 7 anni fa
parent
commit
3960027916
1 ha cambiato i file con 3 aggiunte e 3 eliminazioni
  1. 3 3
      packages/ckeditor5-ui/src/template.js

+ 3 - 3
packages/ckeditor5-ui/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 ) );