Browse Source

Check for empty conversions.

Krzysztof Krztoń 7 years ago
parent
commit
15cb1baf1c

+ 2 - 1
packages/ckeditor5-list/src/converters.js

@@ -835,7 +835,8 @@ function viewToModelListItemChildrenConverter( listItemModel, viewChildren, conv
 			//		<listItem></listItem><paragraph>Foo</paragraph><listItem></listItem>
 			//
 			// so we need to update reference to `lastListItem`.
-			if ( convertedChild.is( 'element' ) && !conversionApi.schema.checkChild( lastListItem, convertedChild.name ) ) {
+			if ( convertedChild && convertedChild.is( 'element' ) &&
+				!conversionApi.schema.checkChild( lastListItem, convertedChild.name ) ) {
 				lastListItem = nextPosition.parent;
 
 				// Depending on the used converter for block elements, usually the position (`result.modelCursor`

+ 5 - 0
packages/ckeditor5-list/tests/listediting.js

@@ -518,6 +518,11 @@ describe( 'ListEditing', () => {
 						'<ul><li>Foo</li></ul><p>Bar</p><ul><li>Baz</li></ul><p>123</p><ul><li>456<ol><li>ABC</li></ol></li></ul>' +
 							'<p>DEF</p><ol><li>GHI</li></ol>'
 					);
+					test(
+						'list with empty inline element',
+						'<ul><li><span></span>Foo<p>Bar</p></li></ul>',
+						'<ul><li>Foo</li></ul><p>Bar</p>'
+					);
 				} );
 			} );
 		} );