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

Rnmobile/upload media failed state #13615

Merged
merged 23 commits into from Jan 31, 2019

Conversation

Projects
None yet
5 participants
@marecar3
Copy link
Contributor

marecar3 commented Jan 31, 2019

Added support for upload media failed state and cancel action.

WPAndroid : wordpress-mobile/WordPress-Android#9158
Gutenberg Mobile : wordpress-mobile/gutenberg-mobile#528

@marecar3 marecar3 requested review from SergioEstevao , mzorz and etoledom Jan 31, 2019

@marecar3

This comment has been minimized.

Copy link
Contributor Author

marecar3 commented Jan 31, 2019

Hey @etoledom, I had merge conflicts with your code, so please check if something is broken, thanks!

@mzorz mzorz referenced this pull request Jan 31, 2019

Merged

Added onRetryUploadForMediaClicked interface for GB #9158

1 of 1 task complete
Implement failed state overlay using ImageBackground.
I also needed to fix some lint errors.
@etoledom

This comment has been minimized.

Copy link
Contributor

etoledom commented Jan 31, 2019

Hey @etoledom, I had merge conflicts with your code, so please check if something is broken, thanks!

Looks good to me! The little wheel is there in the inline toolbar 👍
The block wasn't selecting tapping on the image itself though (iOS).

A heads up that I continue working in the same file, so we will continue having these merge conflicts for a bit more.

@mzorz

mzorz approved these changes Jan 31, 2019

Copy link
Contributor

mzorz left a comment

LGTM, will be all green once lint errors get fixed

@marecar3 marecar3 merged commit 22aba0d into master Jan 31, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@marecar3 marecar3 deleted the rnmobile/upload_media_failed_state branch Jan 31, 2019

daniloercoli added a commit that referenced this pull request Feb 1, 2019

Merge branch 'master' of https://github.com/WordPress/gutenberg into …
…rnmobile/372-use-RichText-on-Title-block

* 'master' of https://github.com/WordPress/gutenberg:
  Try alternate list item jump fix. (#12941)
  Mobile bottom sheet component (#13612)
  Remove unintentional right-margin on last odd-item. (#12199)
  Introduce left and right float alignment options to latest posts block (#8814)
  Fix Google Docs table paste (#13543)
  Increase bottom padding on gallery image caption (#13623)
  Fix the editor save keyboard shortcut not working in code editor view (#13159)
  Plugin: Deprecate gutenberg_add_admin_body_class (#13572)
  Rnmobile/upload media failed state (#13615)
  Make clickOnMoreMenuItem not dependent on aria labels (#13166)
  Add: className prop support to server side render. (#13568)
  Fix: Categories Block: hierarchical Dropdown (#13567)
  Docs: Add clarification about git workflow (#13534)
  Plugin: Remove `user_can_richedit` filtering (#13608)
  eslint-plugin: Add rule `no-unused-vars-before-return` (#12828)
  Image settings button (#13597)
  Fixed wording for the color picker saturation (#13479)

# Conflicts:
#	packages/block-library/src/image/edit.native.js

@youknowriad youknowriad added this to the 5.0 (Gutenberg) milestone Feb 4, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment