Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

compatible with thumbnail which url has no extension #11684

Merged
merged 2 commits into from Aug 9, 2018
Merged

compatible with thumbnail which url has no extension #11684

merged 2 commits into from Aug 9, 2018

Conversation

elantion
Copy link
Contributor

@elantion elantion commented Aug 9, 2018

First of all, thank you for your contribution! :-)

Please makes sure that these checkboxes are checked before submitting your PR, thank you!

  • Make sure that you propose PR to right branch: bugfix for master, feature for latest active branch feature-x.x.
  • Make sure that you follow antd's code convention.
  • Run npm run lint and fix those errors before submitting in order to keep consistent code style.
  • Rebase before creating a PR to keep commit history clear.
  • Add some descriptions and refer relative issues for you PR.

Extra checklist:

if isBugFix :

  • Make sure that you add at least one unit test for the bug which you had fixed.

elif isNewFeature :

  • [] Update API docs for the component.
  • Update/Add demo to demonstrate new feature.
  • Update TypeScript definition for the component.
  • Add unit tests for the feature.

@elantion
Copy link
Contributor Author

elantion commented Aug 9, 2018

ref: #9880

If file.type equal image or one type of png, jpg etc. It will show image thumbnail, no matter url extension.

@ant-design-bot
Copy link
Contributor

ant-design-bot commented Aug 9, 2018

Deploy preview for ant-design ready!

Built with commit c20a78d

https://deploy-preview-11684--ant-design.netlify.com

@@ -264,7 +249,6 @@ describe('Upload List', () => {
await delay(200);
expect(wrapper.state().fileList[2].thumbUrl).not.toBeFalsy();
});

Copy link
Member

Choose a reason for hiding this comment

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

Why delete those blanks?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

After fighting 'LF' and 'CRLF', I forget reset those file. sorry. but it seem like pass lint after all.

Copy link
Member

Choose a reason for hiding this comment

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

You can reset these.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All right, mate. I add another commit to restore those blanks. Please review it. Thanks.

@codecov
Copy link

codecov bot commented Aug 9, 2018

Codecov Report

Merging #11684 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #11684      +/-   ##
==========================================
+ Coverage   92.03%   92.03%   +<.01%     
==========================================
  Files         200      200              
  Lines        5109     5113       +4     
  Branches     1433     1397      -36     
==========================================
+ Hits         4702     4706       +4     
  Misses        403      403              
  Partials        4        4
Impacted Files Coverage Δ
components/upload/UploadList.tsx 90.19% <100%> (+0.4%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7f78cc9...c20a78d. Read the comment docs.

@afc163 afc163 merged commit 583abe8 into ant-design:master Aug 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants