Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Remove complete upload icon in Edge #220

Merged
merged 5 commits into from
Jul 9, 2018
Merged

Remove complete upload icon in Edge #220

merged 5 commits into from
Jul 9, 2018

Conversation

dkonopka
Copy link
Contributor

@dkonopka dkonopka commented Jul 9, 2018

Suggested merge commit message (convention)

Fix: Complete upload icon should not be rendered in Edge. Closes ckeditor/ckeditor5/issues/1066.

@dkonopka dkonopka requested review from oskarwrobel and Mgsy July 9, 2018 07:33
@coveralls
Copy link

coveralls commented Jul 9, 2018

Coverage Status

Coverage remained the same at 100.0% when pulling 61e0e9c on t/ckeditor5/1066 into 30ea1c6 on master.

Copy link
Member

@Mgsy Mgsy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works fine 👌

@@ -263,4 +264,25 @@ describe( 'ImageUploadProgress', () => {
'</figure>]'
);
} );

it( 'should not create completeIcon element when browser is Microsoft Edge', () => {
env.isEdge = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should use sino#stub. And you should restore the stub after the test. You can use testUtils sandbox (it is automatically restored in aftearEach).

testUtils.sinon.stub( env, 'isEdge' ).returns( true );

@oskarwrobel
Copy link
Contributor

CC is decreased #220 (comment)
image

@@ -209,11 +210,14 @@ function _hideProgressBar( viewFigure, writer ) {
function _showCompleteIcon( viewFigure, writer, view ) {
const completeIcon = new UIElement( 'div', { class: 'ck-image-upload-complete-icon' } );

writer.insert( ViewPosition.createAt( viewFigure, 'end' ), completeIcon );
// Because in Edge there is no way to show fancy animation of completeIcon we need to skip it.
if ( !env.isEdge ) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@oskarwrobel
Copy link
Contributor

CI is failing because of https://github.com/ckeditor/ckeditor5-image/issues/221.

@oskarwrobel oskarwrobel merged commit 9a62cf1 into master Jul 9, 2018
@oskarwrobel oskarwrobel deleted the t/ckeditor5/1066 branch July 9, 2018 11:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants