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.

Sign up for GitHub

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
Merged

Rnmobile/upload media failed state #13615

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
5897905
Implement failed state UI
marecar3 Jan 29, 2019
1e77159
Merge branch 'master' into rnmobile/upload_media_failed_state
marecar3 Jan 30, 2019
7022790
Move styles to better place
marecar3 Jan 30, 2019
45ec452
Merge branch 'master' into rnmobile/upload_media_failed_state
marecar3 Jan 30, 2019
b577d29
Support for failed upload retry (#13601)
mzorz Jan 30, 2019
0e9940b
Fixed lint errors
marecar3 Jan 30, 2019
17aaf68
Fixed style
marecar3 Jan 30, 2019
58f9685
removed debugger statement
mzorz Jan 30, 2019
5e7328a
Merge branch 'master' into rnmobile/upload_media_failed_state
marecar3 Jan 30, 2019
10706e4
Merge branch 'rnmobile/upload_media_failed_state' of https://github.c…
mzorz Jan 30, 2019
8d752eb
Merge branch 'rnmobile/upload_media_failed_state' of https://github.c…
mzorz Jan 30, 2019
8e08897
Added onImageUploadCancel method
marecar3 Jan 30, 2019
b6bc888
Refactored names of imageFailed and imageCancel methods
marecar3 Jan 30, 2019
d102ca2
added new state MEDIA_UPLOAD_STATE_RESET to reset associated mediaUrl…
mzorz Jan 31, 2019
eb4f315
Merge branch 'master' into rnmobile/upload_media_failed_state
marecar3 Jan 31, 2019
5149b6f
Implement failed state overlay using ImageBackground.
SergioEstevao Jan 31, 2019
a75ad32
Fixed styles
marecar3 Jan 31, 2019
abbd83c
Merge branch 'master' into rnmobile/upload_media_failed_state
marecar3 Jan 31, 2019
b246604
Disable Touchable view if image isn't in focus
marecar3 Jan 31, 2019
090fc1c
Fixed lint error
marecar3 Jan 31, 2019
e5eaa20
Fixed lint error
marecar3 Jan 31, 2019
3270b10
Fix lint erros
marecar3 Jan 31, 2019
3fa8d38
Merge branch 'master' into rnmobile/upload_media_failed_state
marecar3 Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added onImageUploadCancel method
  • Loading branch information
@marecar3
marecar3 committed Jan 30, 2019
commit 8e08897f309640e226a3d648487f5b48bdbd20d9
5 changes: 2 additions & 3 deletions packages/block-library/src/image/edit.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
requestMediaPickFromDeviceCamera,
mediaUploadSync,
onImageFailedRetry,
onImageUploadCancel
} from 'react-native-gutenberg-bridge';

/**
Expand Down Expand Up @@ -60,10 +61,8 @@ export default class ImageEdit extends React.Component {
onImagePressed() {
const { attributes } = this.props;

// TODO here check whether image is failed. If it is, then call onImageFailedRetry
// if it is not, then call onImageUploadCancel
if ( this.state.isUploadInProgress ) {
// TODO call onImageUploadCancel
onImageUploadCancel( attributes.id )
} else if ( attributes.id && ! isURL( attributes.url ) ) {
onImageFailedRetry( attributes.id );
}
Expand Down