|
|
@@ -87,7 +87,9 @@ describe( 'TodoListEditing', () => {
|
|
|
assertEqualMarkup( getModelData( model ), '<listItem listIndent="0" listType="todo">[]</listItem>' );
|
|
|
assertEqualMarkup( getViewData( view ),
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>[]</li>' +
|
|
|
+ '<li><label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">[]</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>'
|
|
|
);
|
|
|
|
|
|
@@ -96,7 +98,9 @@ describe( 'TodoListEditing', () => {
|
|
|
assertEqualMarkup( getModelData( model ), '<listItem listIndent="0" listType="todo">a[]</listItem>' );
|
|
|
assertEqualMarkup( getViewData( view ),
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>a{}</li>' +
|
|
|
+ '<li><label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">a{}</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>'
|
|
|
);
|
|
|
|
|
|
@@ -105,7 +109,9 @@ describe( 'TodoListEditing', () => {
|
|
|
assertEqualMarkup( getModelData( model ), '<listItem listIndent="0" listType="todo">ab[]</listItem>' );
|
|
|
assertEqualMarkup( getViewData( view ),
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>ab{}</li>' +
|
|
|
+ '<li><label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">ab{}</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>'
|
|
|
);
|
|
|
|
|
|
@@ -129,8 +135,12 @@ describe( 'TodoListEditing', () => {
|
|
|
|
|
|
assertEqualMarkup( getViewData( view ),
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>{}1</li>' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>2</li>' +
|
|
|
+ '<li><label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">{}1</span>' +
|
|
|
+ '</li>' +
|
|
|
+ '<li><label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">2</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>'
|
|
|
);
|
|
|
} );
|
|
|
@@ -148,17 +158,31 @@ describe( 'TodoListEditing', () => {
|
|
|
assertEqualMarkup( getViewData( view ),
|
|
|
'<ul class="todo-list">' +
|
|
|
'<li>' +
|
|
|
- '<label class="todo-list__label" contenteditable="false"></label>{}1.0' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">{}1.0</span>' +
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>2.1</li>' +
|
|
|
'<li>' +
|
|
|
- '<label class="todo-list__label" contenteditable="false"></label>3.1' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">2.1</span>' +
|
|
|
+ '</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">3.1</span>' +
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>4.2</li>' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>5.2</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">4.2</span>' +
|
|
|
+ '</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">5.2</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>' +
|
|
|
'</li>' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>6.1</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">6.1</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>' +
|
|
|
'</li>' +
|
|
|
'</ul>'
|
|
|
@@ -176,18 +200,25 @@ describe( 'TodoListEditing', () => {
|
|
|
|
|
|
assertEqualMarkup( getViewData( view ),
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>{}1.0</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">{}1.0</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>' +
|
|
|
'<ul>' +
|
|
|
'<li>2.0' +
|
|
|
'<ul class="todo-list">' +
|
|
|
'<li>' +
|
|
|
- '<label class="todo-list__label" contenteditable="false"></label>3.1' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">3.1</span>' +
|
|
|
'<ul>' +
|
|
|
'<li>4.2</li>' +
|
|
|
'</ul>' +
|
|
|
'</li>' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>5.1</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">5.1</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>' +
|
|
|
'</li>' +
|
|
|
'</ul>'
|
|
|
@@ -205,18 +236,25 @@ describe( 'TodoListEditing', () => {
|
|
|
|
|
|
assertEqualMarkup( getViewData( view ),
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>{}1.0</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">{}1.0</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>' +
|
|
|
'<ol>' +
|
|
|
'<li>2.0' +
|
|
|
'<ul class="todo-list">' +
|
|
|
'<li>' +
|
|
|
- '<label class="todo-list__label" contenteditable="false"></label>3.1' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">3.1</span>' +
|
|
|
'<ol>' +
|
|
|
'<li>4.2</li>' +
|
|
|
'</ol>' +
|
|
|
'</li>' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>5.1</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">5.1</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>' +
|
|
|
'</li>' +
|
|
|
'</ol>'
|
|
|
@@ -237,7 +275,10 @@ describe( 'TodoListEditing', () => {
|
|
|
'<li>1.0</li>' +
|
|
|
'</ol>' +
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>{}2.0</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">{}2.0</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>' +
|
|
|
'<ol>' +
|
|
|
'<li>3.0</li>' +
|
|
|
@@ -256,13 +297,19 @@ describe( 'TodoListEditing', () => {
|
|
|
|
|
|
assertEqualMarkup( getViewData( view ),
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>1.0</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">1.0</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>' +
|
|
|
'<ol>' +
|
|
|
'<li>{}2.0</li>' +
|
|
|
'</ol>' +
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>3.0</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">3.0</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>'
|
|
|
);
|
|
|
} );
|
|
|
@@ -278,17 +325,71 @@ describe( 'TodoListEditing', () => {
|
|
|
|
|
|
assertEqualMarkup( getViewData( view ),
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>1.0</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">1.0</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>' +
|
|
|
'<ul>' +
|
|
|
'<li>{}2.0</li>' +
|
|
|
'</ul>' +
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>3.0</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">3.0</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>'
|
|
|
);
|
|
|
} );
|
|
|
|
|
|
+ it( 'should properly convert list type change (when next list item is nested)', () => {
|
|
|
+ setModelData( model,
|
|
|
+ '<listItem listType="todo" listIndent="0">1.0</listItem>' +
|
|
|
+ '<listItem listType="numbered" listIndent="0">[]2.0</listItem>' +
|
|
|
+ '<listItem listType="todo" listIndent="1">3.0</listItem>'
|
|
|
+ );
|
|
|
+
|
|
|
+ assertEqualMarkup( getViewData( view ),
|
|
|
+ '<ul class="todo-list">' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">1.0</span>' +
|
|
|
+ '</li>' +
|
|
|
+ '</ul>' +
|
|
|
+ '<ol>' +
|
|
|
+ '<li>' +
|
|
|
+ '{}2.0' +
|
|
|
+ '<ul class="todo-list">' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">3.0</span>' +
|
|
|
+ '</li>' +
|
|
|
+ '</ul>' +
|
|
|
+ '</li>' +
|
|
|
+ '</ol>'
|
|
|
+ );
|
|
|
+
|
|
|
+ editor.execute( 'todoList' );
|
|
|
+
|
|
|
+ assertEqualMarkup( getViewData( view ),
|
|
|
+ '<ul class="todo-list">' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">1.0</span>' +
|
|
|
+ '</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">{}2.0</span>' +
|
|
|
+ '<ul class="todo-list">' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">3.0</span>' +
|
|
|
+ '</li>' +
|
|
|
+ '</ul>' +
|
|
|
+ '</li>' +
|
|
|
+ '</ul>'
|
|
|
+ );
|
|
|
+ } );
|
|
|
it( 'should properly convert list type change - inner text with attribute', () => {
|
|
|
setModelData( model,
|
|
|
'<listItem listType="todo" listIndent="0">1[.0</listItem>' +
|
|
|
@@ -330,7 +431,10 @@ describe( 'TodoListEditing', () => {
|
|
|
|
|
|
assertEqualMarkup( getViewData( view ),
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>{}1.0</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">{}1.0</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>'
|
|
|
);
|
|
|
|
|
|
@@ -340,7 +444,10 @@ describe( 'TodoListEditing', () => {
|
|
|
|
|
|
assertEqualMarkup( getViewData( view ),
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>{}1.0</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">{}1.0</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>'
|
|
|
);
|
|
|
|
|
|
@@ -350,7 +457,10 @@ describe( 'TodoListEditing', () => {
|
|
|
|
|
|
assertEqualMarkup( getViewData( view ),
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>{}1.0</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">{}1.0</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>'
|
|
|
);
|
|
|
} );
|
|
|
@@ -418,7 +528,10 @@ describe( 'TodoListEditing', () => {
|
|
|
|
|
|
assertEqualMarkup( getViewData( view ),
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>{}Foo</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">{}Foo</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>'
|
|
|
);
|
|
|
} );
|
|
|
@@ -428,7 +541,10 @@ describe( 'TodoListEditing', () => {
|
|
|
|
|
|
assertEqualMarkup( getViewData( view ),
|
|
|
'<ul class="todo-list">' +
|
|
|
- '<li><label class="todo-list__label" contenteditable="false"></label>[]</li>' +
|
|
|
+ '<li>' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">[]</span>' +
|
|
|
+ '</li>' +
|
|
|
'</ul>'
|
|
|
);
|
|
|
} );
|
|
|
@@ -474,14 +590,17 @@ describe( 'TodoListEditing', () => {
|
|
|
'<ul class="todo-list">' +
|
|
|
'<li>' +
|
|
|
'<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
- '[]<span class="highlight">' +
|
|
|
- '<element2></element2>' +
|
|
|
- '<element1></element1>' +
|
|
|
- 'foo' +
|
|
|
+ '<span class="todo-list__label__description">' +
|
|
|
+ '[]<span class="highlight">' +
|
|
|
+ '<element2></element2>' +
|
|
|
+ '<element1></element1>' +
|
|
|
+ 'foo' +
|
|
|
+ '</span>' +
|
|
|
'</span>' +
|
|
|
'</li>' +
|
|
|
'<li>' +
|
|
|
- '<label class="todo-list__label" contenteditable="false"></label>bar' +
|
|
|
+ '<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
+ '<span class="todo-list__label__description">bar</span>' +
|
|
|
'</li>' +
|
|
|
'</ul>'
|
|
|
);
|
|
|
@@ -503,7 +622,9 @@ describe( 'TodoListEditing', () => {
|
|
|
'<ul class="todo-list">' +
|
|
|
'<li>' +
|
|
|
'<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
- '<strong>b{}foo</strong>' +
|
|
|
+ '<span class="todo-list__label__description">' +
|
|
|
+ '<strong>b{}foo</strong>' +
|
|
|
+ '</span>' +
|
|
|
'</li>' +
|
|
|
'</ul>'
|
|
|
);
|
|
|
@@ -524,7 +645,9 @@ describe( 'TodoListEditing', () => {
|
|
|
'<ul class="todo-list">' +
|
|
|
'<li>' +
|
|
|
'<label class="todo-list__label" contenteditable="false"></label>' +
|
|
|
- '<a href="foo"><strong>b{}foo</strong></a>' +
|
|
|
+ '<span class="todo-list__label__description">' +
|
|
|
+ '<a class="ck-link_selected" href="foo"><strong>b{}foo</strong></a>' +
|
|
|
+ '</span>' +
|
|
|
'</li>' +
|
|
|
'</ul>'
|
|
|
);
|