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

Jump to bottom

Switch image and audio block to embed block if URL is embeddable #11472

Merged
merged 7 commits into from
Nov 19, 2018
Merged

Switch image and audio block to embed block if URL is embeddable #11472

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9be5a92
Change embed urls to embed block
Soean Nov 4, 2018
3d665e5
Merge branch 'master' into update/audio-image-embed-url
Soean Nov 13, 2018
abb00d3
image error
Soean Nov 13, 2018
8d47ac7
one line
Soean Nov 13, 2018
4f03c39
Merge branch 'master' into update/audio-image-embed-url
Soean Nov 15, 2018
71e420a
Update packages/block-library/src/image/edit.js
Soean Nov 15, 2018
47ec4cb
Merge master
Soean Nov 15, 2018
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
13 changes: 13 additions & 0 deletions packages/block-library/src/audio/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ import {
} from '@wordpress/editor';
import { getBlobByURL, isBlobURL } from '@wordpress/blob';

/**
* Internal dependencies
*/
import { createUpgradedEmbedBlock } from '../embed/util';

const ALLOWED_MEDIA_TYPES = [ 'audio' ];

class AudioEdit extends Component {
Expand Down Expand Up @@ -73,6 +78,14 @@ class AudioEdit extends Component {
// Set the block's src from the edit component's state, and switch off
// the editing UI.
if ( newSrc !== src ) {
// Check if there's an embed block that handles this URL.
const embedBlock = createUpgradedEmbedBlock(
{ attributes: { url: newSrc } }
);
if ( undefined !== embedBlock ) {
this.props.onReplace( embedBlock );
return;
}
setAttributes( { src: newSrc, id: undefined } );
}

Expand Down
16 changes: 14 additions & 2 deletions packages/block-library/src/image/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import { compose } from '@wordpress/compose';
/**
* Internal dependencies
*/
import { createUpgradedEmbedBlock } from '../embed/util';
import ImageSize from './image-size';

/**
Expand Down Expand Up @@ -104,6 +105,7 @@ class ImageEdit extends Component {
this.getFilename = this.getFilename.bind( this );
this.toggleIsEditing = this.toggleIsEditing.bind( this );
this.onUploadError = this.onUploadError.bind( this );
this.onImageError = this.onImageError.bind( this );

this.state = {
captionFocused: false,
Expand Down Expand Up @@ -209,6 +211,16 @@ class ImageEdit extends Component {
} );
}

onImageError( url ) {
// Check if there's an embed block that handles this URL.
const embedBlock = createUpgradedEmbedBlock(
{ attributes: { url } }
);
if ( undefined !== embedBlock ) {
this.props.onReplace( embedBlock );
}
}

onSetCustomHref( value ) {
this.props.setAttributes( { href: value } );
}
Expand Down Expand Up @@ -507,13 +519,13 @@ class ImageEdit extends Component {
} else {
defaultedAlt = __( 'This image has an empty alt attribute' );
}

Soean marked this conversation as resolved.
Show resolved Hide resolved
const img = (
// Disable reason: Image itself is not meant to be interactive, but
// should direct focus to block.
/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
<Fragment>
<img src={ url } alt={ defaultedAlt } onClick={ this.onImageClick } />
<img src={ url } alt={ defaultedAlt } onClick={ this.onImageClick } onError={ () => this.onImageError( url ) } />
{ isBlobURL( url ) && <Spinner /> }
</Fragment>
/* eslint-enable jsx-a11y/no-noninteractive-element-interactions */
Expand Down