Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 06:42:56 +02:00
Code Issues Projects Releases Wiki Activity

Fix some sizing issues with video embeds, and improve video/audio embed shortcode flexibility.

Browse Source 
* `loop`, `autoplay`, and `preload` are now available via the shortcode. Use them non-annoyingly, please!
* Attributes that pass through the filters are now proper key/value pairs, not an array of `key="value"` strings.
* `preload` defaults to `metadata` for videos. This fixes the vertical video preview and Safari ogv/webm playback issues.
* Wrap a div around video embeds to combat a ME.js issue with responsive width=100% themes. Props kovshenin.

Fixes #24134, #24798.

git-svn-id: http://core.svn.wordpress.org/trunk@24789 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Mark Jaquith 2013-07-24 05:52:49 +00:00
parent bc0a60920d
commit 290d61138c
1 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
wp-includes/media.php
View File

@ -856,7 +856,12 @@ function wp_audio_shortcode( $attr ) {
$audio = null;
$default_types = wp_get_audio_extensions();
$defaults_atts = array( 'src' => '' );
$defaults_atts = array(
'src' => '',
'loop' => '',
'autoplay' => '',
'preload' => 'none'
);
foreach ( $default_types as $type )
$defaults_atts[$type] = '';
@ -900,11 +905,25 @@ function wp_audio_shortcode( $attr ) {
}
$atts = array(
sprintf( 'class="%s"', apply_filters( 'wp_audio_shortcode_class', 'wp-audio-shortcode' ) ),
sprintf( 'id="audio-%d-%d"', $post_id, $instances ),
'class' => apply_filters( 'wp_audio_shortcode_class', 'wp-audio-shortcode' ),
'id' => sprintf( 'audio-%d-%d', $post_id, $instances ),
'loop' => $loop,
'autoplay' => $autoplay,
'preload' => $preload,
);
$html = sprintf( '<audio %s controls="controls" preload="none">', join( ' ', $atts ) );
// These ones should just be omitted altogether if they are blank
foreach ( array( 'loop', 'autoplay', 'preload' ) as $a ) {
if ( empty( $atts[$a] ) )
unset( $atts[$a] );
}
$attr_strings = [];
foreach ( $atts as $k => $v ) {
$attr_strings[] = $k . '="' . esc_attr( $v ) . '"';
}
$html = sprintf( '<audio %s controls="controls">', join( ' ', $attr_strings ) );
$fileurl = '';
$source = '<source type="%s" src="%s" />';
@ -957,10 +976,13 @@ function wp_video_shortcode( $attr ) {
$default_types = wp_get_video_extensions();
$defaults_atts = array(
'src' => '',
'poster' => '',
'height' => 360,
'width' => empty( $content_width ) ? 640 : $content_width,
'src' => '',
'poster' => '',
'loop' => '',
'autoplay' => '',
'preload' => 'metadata',
'height' => 360,
'width' => empty( $content_width ) ? 640 : $content_width,
);
foreach ( $default_types as $type )
@ -1018,16 +1040,28 @@ function wp_video_shortcode( $attr ) {
}
$atts = array(
sprintf( 'class="%s"', apply_filters( 'wp_video_shortcode_class', 'wp-video-shortcode' ) ),
sprintf( 'id="video-%d-%d"', $post_id, $instances ),
sprintf( 'width="%d"', $width ),
sprintf( 'height="%d"', $height ),
'class' => apply_filters( 'wp_video_shortcode_class', 'wp-video-shortcode' ),
'id' => sprintf( 'video-%d-%d', $post_id, $instances ),
'width' => absint( $width ),
'height' => absint( $height ),
'poster' => esc_url( $poster ),
'loop' => $loop,
'autoplay' => $autoplay,
'preload' => $preload,
);
if ( ! empty( $poster ) )
$atts[] = sprintf( 'poster="%s"', esc_url( $poster ) );
// These ones should just be omitted altogether if they are blank
foreach ( array( 'poster', 'loop', 'autoplay', 'preload' ) as $a ) {
if ( empty( $atts[$a] ) )
unset( $atts[$a] );
}
$html = sprintf( '<video %s controls="controls" preload="none">', join( ' ', $atts ) );
$attr_strings = [];
foreach ( $atts as $k => $v ) {
$attr_strings[] = $k . '="' . esc_attr( $v ) . '"';
}
$html = sprintf( '<video %s controls="controls">', join( ' ', $attr_strings ) );
$fileurl = '';
$source = '<source type="%s" src="%s" />';
@ -1046,6 +1080,7 @@ function wp_video_shortcode( $attr ) {
$html .= wp_mediaelement_fallback( $fileurl );
$html .= '</video>';
$html = sprintf( '<div style="width: %dpx; max-width: 100%%;">%s</div>', $width, $html );
return apply_filters( 'wp_video_shortcode', $html, $atts, $video, $post_id );
}
add_shortcode( 'video', apply_filters( 'wp_video_shortcode_handler', 'wp_video_shortcode' ) );