Ticket #24820: media-shortcode-cleanup.diff

wp-includes/js/mediaelement/wp-mediaelement.js

@@ -6 +6 @@
     $(function () {
                 $('.wp-audio-shortcode, .wp-video-shortcode').mediaelementplayer();
         });
-
 }(jQuery));
- No newline at end of file

wp-includes/media.php

@@ -860 +860 @@
                 'src'      => '',
                 'loop'     => '',
                 'autoplay' => '',
-                'preload' => 'none'
+                'preload'  => 'none',
+                'width'    => empty( $content_width ) ? 640 : $content_width
+
         );
         foreach ( $default_types as $type )
                 $defaults_atts[$type] = '';
@@ -872 +874 @@
         if ( ! empty( $src ) ) {
                 $type = wp_check_filetype( $src );
                 if ( ! in_array( $type['ext'], $default_types ) )
-                        return sprintf( '<a class="wp-post-format-link-audio" href="%s">%s</a>', esc_url( $src ), esc_html( $src ) );
+                        return sprintf( '<a class="wp-media-embedded wp-audio" href="%s">%s</a>', esc_url( $src ), esc_html( $src ) );
                 $primary = true;
                 array_unshift( $default_types, 'src' );
         } else {
@@ -902 +904 @@
         if ( 'mediaelement' === $library && did_action( 'init' ) ) {
                 wp_enqueue_style( 'wp-mediaelement' );
                 wp_enqueue_script( 'wp-mediaelement' );
+                wp_localize_script( 'wp_mediaelement', 'mediaelementArgs', array( 'maxWidth' => $max_width ));
         }
 
         $atts = array(
@@ -1007 +1010 @@
         if ( ! empty( $src ) ) {
                 $type = wp_check_filetype( $src );
                 if ( ! in_array( $type['ext'], $default_types ) )
-                        return sprintf( '<a class="wp-post-format-link-video" href="%s">%s</a>', esc_url( $src ), esc_html( $src ) );
+                        return sprintf( '<a class="wp-media-embedded wp-video" href="%s">%s</a>', esc_url( $src ), esc_html( $src ) );
                 $primary = true;
                 array_unshift( $default_types, 'src' );
         } else {
@@ -1037 +1040 @@
         if ( 'mediaelement' === $library && did_action( 'init' ) ) {
                 wp_enqueue_style( 'wp-mediaelement' );
                 wp_enqueue_script( 'wp-mediaelement' );
+                wp_localize_script( 'wp_mediaelement', 'mediaelementArgs', array( 'width' => $width ));
+
         }
 
         $atts = array(