Ticket #24449: 24449.6.diff

wp-includes/js/media-views.js

@@ -462 +462 @@
                 },
 
                 canEmbed: function( attachment ) {
-                        var type = attachment.get('type');
-                        if ( type !== 'audio' && type !== 'video' )
-                                return false;
+                        // If uploading, we know the filename but not the mime type.
+                        if ( ! attachment.get('uploading') ) {
+                                var type = attachment.get('type');
+                                if ( type !== 'audio' && type !== 'video' )
+                                        return false;
+                        }
 
                         return _.contains( media.view.settings.embedExts, attachment.get('filename').split('.').pop() );
                 },

wp-includes/media-template.php

@@ -297 +297 @@
                                                 data-user-setting="urlbutton"
                                         <# } #>>
 
-                                <# if ( data.model.canEmbed && 'audio' === data.type ) { #>
+                                <# if ( data.model.canEmbed ) { #>
                                         <option value="embed" selected>
-                                                <?php esc_attr_e('Embed Audio Player'); ?>
+                                                <?php esc_attr_e('Embed Media Player'); ?>
                                         </option>
                                         <option value="file">
-                                <# } else if ( data.model.canEmbed && 'video' === data.type ) { #>
-                                        <option value="embed" selected>
-                                                <?php esc_attr_e('Embed Video Player'); ?>
-                                        </option>
-                                        <option value="file">
                                 <# } else { #>
                                         <option value="file" selected>
                                 <# } #>