Changeset 24777

Timestamp:

07/23/2013 05:39:08 AM (13 years ago)

Author:

nacin

Message:

Media: Add awareness to Attachment Display Settings that audio and video can be embedded.

Also:

• Add file length metadata to Attachment Details.
• Round the kb/s bitrate on post.php.

fixes #24449.

Location:

trunk

Files:

• wp-admin/includes/media.php (modified) (1 diff)
• wp-includes/js/media-editor.js (modified) (2 diffs)
• wp-includes/js/media-views.js (modified) (2 diffs)
• wp-includes/media-template.php (modified) (2 diffs)
• wp-includes/media.php (modified) (2 diffs)

trunk/wp-admin/includes/media.php

@@ -2471 +2471 @@
         <div class="misc-pub-section">
             <?php _e( 'Bitrate:' ); ?> <strong><?php
-                echo $meta['bitrate'] / 1000, 'kb/s';
+                echo round( $meta['bitrate'] / 1000 ), 'kb/s';
 
                 if ( ! empty( $meta['bitrate_mode'] ) )

trunk/wp-includes/js/media-editor.js

@@ -46 +46 @@
 
             link = props.link || defaultProps.link || getUserSetting( 'urlbutton', 'file' );
-            if ( 'file' === link )
+            if ( 'file' === link || 'embed' === link )
                 linkUrl = attachment.url;
             else if ( 'post' === link )
@@ -98 +98 @@
 
         audio: function( props, attachment ) {
-            var shortcode, html;
+            return wp.media.string._audioVideo( 'audio', props, attachment );
+        },
+
+        video: function( props, attachment ) {
+            return wp.media.string._audioVideo( 'video', props, attachment );
+        },
+
+        _audioVideo: function( type, props, attachment ) {
+            var shortcode, html, extension;
 
             props = wp.media.string.props( props, attachment );
+            if ( props.link !== 'embed' )
+                return wp.media.string.link( props );
+
             shortcode = {};
 
-            if ( props.mime ) {
-                switch ( props.mime ) {
-                case 'audio/mpeg':
-                    if ( attachment.url.indexOf( 'mp3' ) )
-                        shortcode.mp3 = attachment.url;
-                    else if ( attachment.url.indexOf( 'm4a' ) )
-                        shortcode.m4a = attachment.url;
-                    break;
-                case 'audio/mp3':
-                    shortcode.mp3 = attachment.url;
-                    break;
-                case 'audio/m4a':
-                    shortcode.m4a = attachment.url;
-                    break;
-                case 'audio/wav':
-                    shortcode.wav = attachment.url;
-                    break;
-                case 'audio/ogg':
-                    shortcode.ogg = attachment.url;
-                    break;
-                case 'audio/x-ms-wma':
-                case 'audio/wma':
-                    shortcode.wma = attachment.url;
-                    break;
-                default:
-                    // Render unsupported audio files as links.
-                    return wp.media.string.link( props );
-                }
+            if ( 'video' === type ) {
+                if ( attachment.width )
+                    shortcode.width = attachment.width;
+
+                if ( attachment.height )
+                    shortcode.height = attachment.height;
+            }
+
+            extension = attachment.filename.split('.').pop();
+
+            if ( _.contains( wp.media.view.settings.embedExts, extension ) ) {
+                shortcode[extension] = attachment.url;
+            } else {
+                // Render unsupported audio and video files as links.
+                return wp.media.string.link( props );
             }
 
             html = wp.shortcode.string({
-                tag:     'audio',
-                attrs:   shortcode
-            });
-
-            return html;
-        },
-
-        video: function( props, attachment ) {
-            var shortcode, html;
-
-            props = wp.media.string.props( props, attachment );
-
-            shortcode = {};
-
-            if ( attachment.width )
-                shortcode.width = attachment.width;
-
-            if ( attachment.height )
-                shortcode.height = attachment.height;
-
-            if ( props.mime ) {
-                switch ( props.mime ) {
-                case 'video/mp4':
-                    shortcode.mp4 = attachment.url;
-                    break;
-                case 'video/m4v':
-                    shortcode.m4v = attachment.url;
-                    break;
-                case 'video/webm':
-                    shortcode.webm = attachment.url;
-                    break;
-                case 'video/ogg':
-                    shortcode.ogv = attachment.url;
-                    break;
-                case 'video/x-ms-wmv':
-                case 'video/wmv':
-                case 'video/asf':
-                    shortcode.wmv = attachment.url;
-                    break;
-                case 'video/flv':
-                case 'video/x-flv':
-                    shortcode.flv = attachment.url;
-                    break;
-                }
-            }
-
-            html = wp.shortcode.string({
-                tag:     'video',
+                tag:     type,
                 attrs:   shortcode
             });

trunk/wp-includes/js/media-views.js

@@ -450 +450 @@
 
             if ( ! displays[ attachment.cid ] )
-                displays[ attachment.cid ] = new Backbone.Model( this._defaultDisplaySettings );
+                displays[ attachment.cid ] = new Backbone.Model( this.defaultDisplaySettings( attachment ) );
 
             return displays[ attachment.cid ];
+        },
+
+        defaultDisplaySettings: function( attachment ) {
+            settings = this._defaultDisplaySettings;
+            if ( settings.canEmbed = this.canEmbed( attachment ) )
+                settings.link = 'embed';
+            return settings;
+        },
+
+        canEmbed: function( attachment ) {
+            var type = attachment.get('type');
+            if ( type !== 'audio' && type !== 'video' )
+                return false;
+
+            return _.contains( media.view.settings.embedExts, attachment.get('filename').split('.').pop() );
         },
 
@@ -3667 +3682 @@
                 attachment = this.options.attachment;
 
-            if ( 'none' === linkTo || ( ! attachment && 'custom' !== linkTo ) ) {
+            if ( 'none' === linkTo || 'embed' === linkTo || ( ! attachment && 'custom' !== linkTo ) ) {
                 $input.hide();
                 return;

trunk/wp-includes/media-template.php

@@ -206 +206 @@
                 <# } #>
 
+                <# if ( data.fileLength ) { #>
+                    <div class="file-length"><?php _e( 'Length:' ); ?> {{ data.fileLength }}</div>
+                <# } #>
+
                 <# if ( ! data.uploading && data.can.remove ) { #>
                     <a class="delete-attachment" href="#"><?php _e( 'Delete Permanently' ); ?></a>
@@ -282 +286 @@
         <div class="setting">
             <label>
-                <span><?php _e('Link To'); ?></span>
+                <# if ( data.model.canEmbed ) { #>
+                    <span><?php _e('Embed or Link'); ?></span>
+                <# } else { #>
+                    <span><?php _e('Link To'); ?></span>
+                <# } #>
+
                 <select class="link-to"
                     data-setting="link"
-                    <# if ( data.userSettings ) { #>
+                    <# if ( data.userSettings && ! data.model.canEmbed ) { #>
                         data-user-setting="urlbutton"
                     <# } #>>
 
+                <# if ( data.model.canEmbed && 'audio' === data.type ) { #>
+                    <option value="embed" selected>
+                        <?php esc_attr_e('Embed Audio 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>
+                <# } #>
+                    <# if ( data.model.canEmbed ) { #>
+                        <?php esc_attr_e('Link to Media File'); ?>
+                    <# } else { #>
+                        <?php esc_attr_e('Media File'); ?>
+                    <# } #>
+                    </option>
+                    <option value="post">
+                    <# if ( data.model.canEmbed ) { #>
+                        <?php esc_attr_e('Link to Attachment Page'); ?>
+                    <# } else { #>
+                        <?php esc_attr_e('Attachment Page'); ?>
+                    <# } #>
+                    </option>
+                <# if ( 'image' === data.type ) { #>
                     <option value="custom">
                         <?php esc_attr_e('Custom URL'); ?>
                     </option>
-                    <option value="file" selected>
-                        <?php esc_attr_e('Media File'); ?>
-                    </option>
-                    <option value="post">
-                        <?php esc_attr_e('Attachment Page'); ?>
-                    </option>
                     <option value="none">
                         <?php esc_attr_e('None'); ?>
                     </option>
+                <# } #>
                 </select>
             </label>

trunk/wp-includes/media.php

@@ -1700 +1700 @@
     }
 
+    if ( $meta && ( 'audio' === $type || 'video' === $type ) ) {
+        if ( isset( $meta['length_formatted'] ) )
+            $response['fileLength'] = $meta['length_formatted'];
+    }
+
     if ( function_exists('get_compat_media_markup') )
         $response['compat'] = get_compat_media_markup( $attachment->ID, array( 'in_modal' => true ) );
@@ -1754 +1759 @@
         ),
         'defaultProps' => $props,
+        'embedExts'    => array_merge( wp_get_audio_extensions(), wp_get_video_extensions() ),
     );