|
@@ -75,8 +75,8 @@ describe( 'ImageUploadProgress', () => {
|
|
|
|
|
|
|
|
expect( getViewData( view ) ).to.equal(
|
|
expect( getViewData( view ) ).to.equal(
|
|
|
'[<figure class="ck-appear ck-image-upload-placeholder ck-widget image" contenteditable="false">' +
|
|
'[<figure class="ck-appear ck-image-upload-placeholder ck-widget image" contenteditable="false">' +
|
|
|
- `<img src="data:image/svg+xml;utf8,${ imagePlaceholder }"></img>` +
|
|
|
|
|
- '<div class="ck-upload-placeholder-loader"></div>' +
|
|
|
|
|
|
|
+ `<img src="data:image/svg+xml;utf8,${ imagePlaceholder }"></img>` +
|
|
|
|
|
+ '<div class="ck-upload-placeholder-loader"></div>' +
|
|
|
'</figure>]<p>foo</p>'
|
|
'</figure>]<p>foo</p>'
|
|
|
);
|
|
);
|
|
|
} );
|
|
} );
|
|
@@ -104,6 +104,7 @@ describe( 'ImageUploadProgress', () => {
|
|
|
} );
|
|
} );
|
|
|
|
|
|
|
|
// See https://github.com/ckeditor/ckeditor5/issues/1985.
|
|
// See https://github.com/ckeditor/ckeditor5/issues/1985.
|
|
|
|
|
+ // Might be obsolete after changes in table refreshing (now it refreshes siblings of an image and not its parent).
|
|
|
it( 'should work if image parent is refreshed by the differ', function( done ) {
|
|
it( 'should work if image parent is refreshed by the differ', function( done ) {
|
|
|
model.schema.register( 'outerBlock', {
|
|
model.schema.register( 'outerBlock', {
|
|
|
allowWhere: '$block',
|
|
allowWhere: '$block',
|
|
@@ -125,7 +126,7 @@ describe( 'ImageUploadProgress', () => {
|
|
|
if ( change.type == 'insert' && change.name == 'image' ) {
|
|
if ( change.type == 'insert' && change.name == 'image' ) {
|
|
|
doc.differ.refreshItem( change.position.parent );
|
|
doc.differ.refreshItem( change.position.parent );
|
|
|
|
|
|
|
|
- return true;
|
|
|
|
|
|
|
+ return false; // Refreshing item should not trigger calling post-fixer again.
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
} );
|
|
} );
|
|
@@ -137,10 +138,14 @@ describe( 'ImageUploadProgress', () => {
|
|
|
model.document.once( 'change', () => {
|
|
model.document.once( 'change', () => {
|
|
|
try {
|
|
try {
|
|
|
expect( getViewData( view ) ).to.equal(
|
|
expect( getViewData( view ) ).to.equal(
|
|
|
- '<outerBlock><innerBlock>[<figure class="ck-appear ck-widget image" contenteditable="false">' +
|
|
|
|
|
|
|
+ '<outerBlock>' +
|
|
|
|
|
+ '<innerBlock>' +
|
|
|
|
|
+ '[<figure class="ck-appear ck-widget image" contenteditable="false">' +
|
|
|
`<img src="${ base64Sample }"></img>` +
|
|
`<img src="${ base64Sample }"></img>` +
|
|
|
'<div class="ck-progress-bar"></div>' +
|
|
'<div class="ck-progress-bar"></div>' +
|
|
|
- '</figure>]</innerBlock></outerBlock>'
|
|
|
|
|
|
|
+ '</figure>]' +
|
|
|
|
|
+ '</innerBlock>' +
|
|
|
|
|
+ '</outerBlock>'
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
done();
|
|
done();
|
|
@@ -169,8 +174,8 @@ describe( 'ImageUploadProgress', () => {
|
|
|
|
|
|
|
|
expect( getViewData( view ) ).to.equal(
|
|
expect( getViewData( view ) ).to.equal(
|
|
|
'[<figure class="ck-appear ck-widget image" contenteditable="false">' +
|
|
'[<figure class="ck-appear ck-widget image" contenteditable="false">' +
|
|
|
- '<img src="image.png"></img>' +
|
|
|
|
|
- '<div class="ck-progress-bar"></div>' +
|
|
|
|
|
|
|
+ '<img src="image.png"></img>' +
|
|
|
|
|
+ '<div class="ck-progress-bar"></div>' +
|
|
|
'</figure>]'
|
|
'</figure>]'
|
|
|
);
|
|
);
|
|
|
} );
|
|
} );
|
|
@@ -187,8 +192,8 @@ describe( 'ImageUploadProgress', () => {
|
|
|
|
|
|
|
|
expect( getViewData( view ) ).to.equal(
|
|
expect( getViewData( view ) ).to.equal(
|
|
|
'[<figure class="ck-appear ck-image-upload-placeholder ck-widget image" contenteditable="false">' +
|
|
'[<figure class="ck-appear ck-image-upload-placeholder ck-widget image" contenteditable="false">' +
|
|
|
- `<img src="data:image/svg+xml;utf8,${ imagePlaceholder }"></img>` +
|
|
|
|
|
- '<div class="ck-upload-placeholder-loader"></div>' +
|
|
|
|
|
|
|
+ `<img src="data:image/svg+xml;utf8,${ imagePlaceholder }"></img>` +
|
|
|
|
|
+ '<div class="ck-upload-placeholder-loader"></div>' +
|
|
|
'</figure>]'
|
|
'</figure>]'
|
|
|
);
|
|
);
|
|
|
} );
|
|
} );
|
|
@@ -210,7 +215,7 @@ describe( 'ImageUploadProgress', () => {
|
|
|
|
|
|
|
|
expect( getViewData( view ) ).to.equal(
|
|
expect( getViewData( view ) ).to.equal(
|
|
|
'[<figure class="ck-widget image" contenteditable="false">' +
|
|
'[<figure class="ck-widget image" contenteditable="false">' +
|
|
|
- `<img src="data:image/svg+xml;utf8,${ imagePlaceholder }"></img>` +
|
|
|
|
|
|
|
+ `<img src="data:image/svg+xml;utf8,${ imagePlaceholder }"></img>` +
|
|
|
'</figure>]'
|
|
'</figure>]'
|
|
|
);
|
|
);
|
|
|
} );
|
|
} );
|
|
@@ -284,8 +289,8 @@ describe( 'ImageUploadProgress', () => {
|
|
|
|
|
|
|
|
expect( getViewData( view ) ).to.equal(
|
|
expect( getViewData( view ) ).to.equal(
|
|
|
'[<figure class="ck-appear ck-image-upload-placeholder ck-widget image" contenteditable="false">' +
|
|
'[<figure class="ck-appear ck-image-upload-placeholder ck-widget image" contenteditable="false">' +
|
|
|
- `<img src="${ base64Sample }"></img>` +
|
|
|
|
|
- '<div class="ck-upload-placeholder-loader"></div>' +
|
|
|
|
|
|
|
+ `<img src="${ base64Sample }"></img>` +
|
|
|
|
|
+ '<div class="ck-upload-placeholder-loader"></div>' +
|
|
|
'</figure>]<p>foo</p>'
|
|
'</figure>]<p>foo</p>'
|
|
|
);
|
|
);
|
|
|
} );
|
|
} );
|
|
@@ -314,8 +319,8 @@ describe( 'ImageUploadProgress', () => {
|
|
|
|
|
|
|
|
expect( getViewData( view ) ).to.equal(
|
|
expect( getViewData( view ) ).to.equal(
|
|
|
'[<figure class="ck-appear ck-image-upload-placeholder ck-widget image" contenteditable="false">' +
|
|
'[<figure class="ck-appear ck-image-upload-placeholder ck-widget image" contenteditable="false">' +
|
|
|
- `<img src="data:image/svg+xml;utf8,${ imagePlaceholder }"></img>` +
|
|
|
|
|
- '<div class="ck-upload-placeholder-loader"></div>' +
|
|
|
|
|
|
|
+ `<img src="data:image/svg+xml;utf8,${ imagePlaceholder }"></img>` +
|
|
|
|
|
+ '<div class="ck-upload-placeholder-loader"></div>' +
|
|
|
'</figure>]'
|
|
'</figure>]'
|
|
|
);
|
|
);
|
|
|
|
|
|
|
@@ -325,7 +330,7 @@ describe( 'ImageUploadProgress', () => {
|
|
|
|
|
|
|
|
expect( getViewData( view ) ).to.equal(
|
|
expect( getViewData( view ) ).to.equal(
|
|
|
'[<figure class="ck-widget image" contenteditable="false">' +
|
|
'[<figure class="ck-widget image" contenteditable="false">' +
|
|
|
- `<img src="data:image/svg+xml;utf8,${ imagePlaceholder }"></img>` +
|
|
|
|
|
|
|
+ `<img src="data:image/svg+xml;utf8,${ imagePlaceholder }"></img>` +
|
|
|
'</figure>]'
|
|
'</figure>]'
|
|
|
);
|
|
);
|
|
|
} );
|
|
} );
|