Ticket #23282: 23282.2.diff

wp-includes/media.php

@@ -803 +803 @@
 }
 
 /**
+ * The Audio shortcode.
+ *
+ * This implements the functionality of the Audio Shortcode for displaying
+ * WordPress mp3s in a post.
+ *
+ * @since 3.6.0
+ *
+ * @param array $attr Attributes of the shortcode.
+ * @return string HTML content to display audio.
+ */
+function wp_audio_shortcode( $attr ) {
+        $post = get_post();
+
+        static $instances = 0;
+        $instances++;
+
+        $audio = null;
+
+        extract( shortcode_atts( array( 'src' => '' ), $attr ) );
+
+        if ( empty( $src ) ) {
+                $children = get_children( array(
+                        'post_parent' => $post->ID,
+                        'post_type' => 'attachment',
+                        'post_mime_type' => 'audio',
+                        'posts_per_page' => 1
+                ) );
+
+                if ( empty( $children ) )
+                        return;
+
+                $audio = reset( $children );
+                $src = wp_get_attachment_url( $audio->ID );
+                if ( empty( $src ) )
+                        return;
+        }
+
+        wp_enqueue_style( 'wp-mediaelement' );
+        wp_enqueue_script( 'wp-mediaelement' );
+
+        $html = sprintf( '<audio class="%s" id="%s" src="%s" type="audio/mp3" controls="controls"></audio>',
+                apply_filters( 'audio_shortcode_class', 'wp-audio-shortcode' ),
+                sprintf( 'audio-%d-%d', $post->ID, $instances ),
+                esc_url( $src )
+        );
+
+        return apply_filters( 'audio_shortcode', $html, $src, $audio, $post );
+}
+add_shortcode( 'audio', 'wp_audio_shortcode' );
+
+/**
+ * The Video shortcode.
+ *
+ * This implements the functionality of the Video Shortcode for displaying
+ * WordPress mp4s in a post.
+ *
+ * @since 3.6.0
+ *
+ * @param array $attr Attributes of the shortcode.
+ * @return string HTML content to display video.
+ */
+function wp_video_shortcode( $attr ) {
+        global $content_width;
+        $post = get_post();
+
+        static $instances = 0;
+        $instances++;
+
+        $video = null;
+
+        extract( shortcode_atts( array(
+                'src' => '',
+                'width' => empty( $content_width ) ? 640 : $content_width,
+                'height' => 360,
+                'poster' => '',
+                'webm' => '',
+                'ogv' => '',
+                'flash' => true
+        ), $attr ) );
+
+        if ( empty( $src ) ) {
+                $children = get_children( array(
+                        'post_parent' => $post->ID,
+                        'post_type' => 'attachment',
+                        'post_mime_type' => 'video',
+                        'posts_per_page' => 1
+                ) );
+
+                if ( empty( $children ) )
+                        return;
+
+                $video = reset( $children );
+                $src = wp_get_attachment_url( $video->ID );
+                if ( empty( $src ) )
+                        return;
+        }
+
+        wp_enqueue_style( 'wp-mediaelement' );
+        wp_enqueue_script( 'wp-mediaelement' );
+
+        $atts = array(
+                sprintf( 'class="%s"', apply_filters( 'video_shortcode_class', 'wp-video-shortcode' ) ),
+                sprintf( 'id="video-%d-%d"', $post->ID, $instances ),
+                sprintf( 'width="%d"', $width ),
+                sprintf( 'height="%d"', $height ),
+        );
+
+        if ( ! empty( $poster ) )
+                $atts[] = sprintf( 'poster="%s"', esc_url( $poster ) );
+
+        if ( empty( $webm ) && empty( $ogv ) ) {
+                $atts[] = sprintf( 'src="%s"', esc_url( $src ) );
+                $atts[] = 'type="video/mp4"';
+
+                $html = sprintf( '<video %s controls="controls" preload="none"></video>',
+                        join( ' ', $atts )
+                );
+        } else {
+                $source = '<source type="%s" src="%s" />';
+
+                $html = sprintf( '<video %s controls="controls" preload="none">', join( ' ', $atts ) );
+                $html .= sprintf( $source, 'video/mp4', $src );
+                if ( ! empty( $webm ) )
+                        $html .= sprintf( $source, 'video/webm', $webm );
+                if ( ! empty( $ogv ) )
+                        $html .= sprintf( $source, 'video/ogg', $ogv );
+
+                if ( $flash && 'false' !== $flash ) {
+                        $flashsrc = '/wp-includes/js/mediaelement/flashmediaelement.swf';
+
+                        $html .= sprintf( '<object width="%d" height="%d" type="application/x-shockwave-flash" data="%s">',
+                                $width,
+                                $height,
+                                $flashsrc
+                        );
+
+                        $html .= sprintf( '<param name="movie" value="%s"/>', esc_url( $flashsrc ) );
+                        $html .= sprintf( '<param name="flashvars" value="controls=true&amp;file=%s"/>', esc_url( $src ) );
+                        if ( ! empty( $poster ) )
+                                $html .= sprintf( '<img src="%s" width="%d" height="%d" />',
+                                        esc_url( $poster ),
+                                        $width,
+                                        $height
+                                );
+                        $html .= '</object>';
+                }
+                $html .= '</video>';
+        }
+
+        return apply_filters( 'video_shortcode', $html, $src, $video, $post );
+}
+add_shortcode( 'video', 'wp_video_shortcode' );
+
+/**
  * Display previous image link that has the same post parent.
  *
  * @since 2.5.0

wp-includes/script-loader.php

@@ -274 +274 @@
 
         $scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), '0.9.8', 1 );
 
+        $scripts->add( 'mediaelement', "/wp-includes/js/mediaelement/mediaelement-and-player$suffix.js", array('jquery'), '2.10.1', 1 );
+        $scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement.js", array('mediaelement'), false, 1 );
+
         $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'password-strength-meter', 'pwsL10n', array(
                 'empty' => __('Strength indicator'),
@@ -538 +541 @@
         $styles->add( 'media-views', "/wp-includes/css/media-views$suffix.css", array( 'buttons' ) );
         $styles->add( 'buttons', "/wp-includes/css/buttons$suffix.css" );
 
+        $styles->add( 'mediaelement', "/wp-includes/js/mediaelement/mediaelementplayer$suffix.css" );
+        $styles->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement.css", array( 'mediaelement' ) );
+
         foreach ( $rtl_styles as $rtl_style ) {
                 $styles->add_data( $rtl_style, 'rtl', true );
                 if ( $suffix && ! in_array( $rtl_style, $no_suffix ) )