Jelajahi Sumber

Merge branch 'gjhenrique-nested-list-reborn'

Marek Lewandowski 5 tahun lalu
induk
melakukan
ab3fbb4eb6

+ 1 - 1
packages/ckeditor5-paste-from-office/src/filters/list.js

@@ -18,7 +18,7 @@ import UpcastWriter from '@ckeditor/ckeditor5-engine/src/view/upcastwriter';
  *		<p class=MsoListParagraphCxSpFirst style='mso-list:l1 level1 lfo1'>...</p> // Paragraph based list.
  *		<h1 style='mso-list:l0 level1 lfo1'>...</h1> // Heading 1 based list.
  *
- * @param {module:engine/view/documentfragment~DocumentFragment} documentFragment The view structure which to transform.
+ * @param {module:engine/view/documentfragment~DocumentFragment} documentFragment The view structure to be transformed.
  * @param {String} stylesString Styles from which list-like elements styling will be extracted.
  */
 export function transformListItemLikeElementsIntoLists( documentFragment, stylesString ) {

+ 16 - 7
packages/ckeditor5-paste-from-office/tests/filters/list.js

@@ -82,7 +82,7 @@ describe( 'PasteFromOffice - filters', () => {
 				expect( stringify( view ) ).to.equal( '' );
 			} );
 
-			describe( 'Nesting', () => {
+			describe( 'nesting', () => {
 				const level1 = 'style="mso-list:l0 level1 lfo0"';
 				const level2 = 'style="mso-list:l0 level2 lfo0"';
 				const level3 = 'style="mso-list:l0 level3 lfo0"';
@@ -98,7 +98,9 @@ describe( 'PasteFromOffice - filters', () => {
 					expect( stringify( view ) ).to.equal(
 						`<ol><li ${ level1 }>Foo` +
 							`<ol><li ${ level2 }>Bar` +
-								`<ol><li ${ level3 }>Baz</li></ol></li></ol></li></ol>` );
+								`<ol><li ${ level3 }>Baz</li></ol>` +
+							'</li></ol>' +
+						'</li></ol>' );
 				} );
 
 				it( 'handles non-linear indentation', () => {
@@ -111,7 +113,9 @@ describe( 'PasteFromOffice - filters', () => {
 					expect( stringify( view ) ).to.equal(
 						`<ol><li ${ level1 }>Foo` +
 							`<ol><li ${ level3 }>Bar` +
-								`<ol><li ${ level4 }>Baz</li></ol></li></ol></li></ol>` );
+								`<ol><li ${ level4 }>Baz</li></ol>` +
+							'</li></ol>' +
+						'</li></ol>' );
 				} );
 
 				it( 'handles indentation in both directions', () => {
@@ -141,7 +145,9 @@ describe( 'PasteFromOffice - filters', () => {
 					expect( stringify( view ) ).to.equal(
 						`<ul><li ${ level1 }>Foo` +
 							`<ol><li ${ level2 }>Bar` +
-								`<ul><li ${ level3 }>Baz</li></ul></li></ol></li></ul>` );
+								`<ul><li ${ level3 }>Baz</li></ul>` +
+							'</li></ol>' +
+						'</li></ul>' );
 				} );
 
 				it( 'handles different list styles #2', () => {
@@ -168,9 +174,12 @@ describe( 'PasteFromOffice - filters', () => {
 
 					expect( view.childCount ).to.equal( 1 );
 					expect( stringify( view ) ).to.equal(
-						`<ol><li ${ level2 }>Foo` +
-						`</li><li ${ level1 }>Bar` +
-							`<ol><li ${ level2 }>Baz</li></ol></li></ol>` );
+						'<ol>' +
+							`<li ${ level2 }>Foo</li>` +
+							`<li ${ level1 }>Bar` +
+								`<ol><li ${ level2 }>Baz</li></ol>` +
+							'</li>' +
+						'</ol>' );
 				} );
 			} );
 		} );