Ticket #27389: 27389.5.diff

src/wp-includes/class-wp-editor.php

@@ -343 +343 @@
                                 $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
                                 $version = 'ver=' . $GLOBALS['wp_version'];
                                 $dashicons = includes_url( "css/dashicons$suffix.css?$version" );
+                                $mediaelement = includes_url( "js/mediaelement/mediaelementplayer.min.css?$version" );
+                                $wpmediaelement = includes_url( "js/mediaelement/wp-mediaelement.css?$version" );
 
                                 // WordPress default stylesheet and dashicons
-                                $mce_css = array( $dashicons, self::$baseurl . '/skins/wordpress/wp-content.css' );
+                                $mce_css = array(
+                                        $dashicons,
+                                        $mediaelement,
+                                        $wpmediaelement,
+                                        self::$baseurl . '/skins/wordpress/wp-content.css'
+                                );
 
                                 // load editor_style.css if the current theme supports it
                                 if ( ! empty( $GLOBALS['editor_styles'] ) && is_array( $GLOBALS['editor_styles'] ) ) {

src/wp-includes/js/mce-view.js

@@ -1 @@
-/* global tinymce */
+/* global tinymce, _wpmejsSettings, MediaElementPlayer */
 
 // Ensure the global `wp` object exists.
 window.wp = window.wp || {};
@@ -31 +31 @@
                         var html = this.getHtml();
                         // Search all tinymce editor instances and update the placeholders
                         _.each( tinymce.editors, function( editor ) {
-                                var doc;
+                                var doc, self = this;
                                 if ( editor.plugins.wpview ) {
                                         doc = editor.getDoc();
-                                        $( doc ).find( '[data-wpview-text="' + this.encodedText + '"]' ).html( html );
+                                        $( doc ).find( '[data-wpview-text="' + this.encodedText + '"]' ).each(function (i, elem) {
+                                                var node = $( elem );
+                                                node.html( html );
+                                                $( self ).trigger( 'ready', elem );
+                                        });
                                 }
                         }, this );
                 }
@@ -178 +182 @@
 
                 /**
                  * Refresh views after an update is made
-                 * 
+                 *
                  * @param view {object} being refreshed
                  * @param text {string} textual representation of the view
                  */
@@ -204 +208 @@
                         return instances[ encodedText ];
                 },
 
-                /** 
+                /**
                  * render( scope )
-                 * 
+                 *
                  * Renders any view instances inside a DOM node `scope`.
                  *
                  * View instances are detected by the presence of wrapper elements.
@@ -302 +306 @@
 
         };
         wp.mce.views.register( 'gallery', wp.mce.gallery );
+
+        wp.mce.media = {
+                toView:  function( content ) {
+                        var match = wp.shortcode.next( this.shortcode, content );
+
+                        if ( ! match ) {
+                                return;
+                        }
+
+                        return {
+                                index:   match.index,
+                                content: match.content,
+                                options: {
+                                        shortcode: match.shortcode
+                                }
+                        };
+                },
+
+                edit: function( node ) {
+                        var p,
+                                media = wp.media[ this.shortcode ],
+                                self = this,
+                                frame, data;
+
+                        if ( window.mejs && window.mejs.players ) {
+                                for ( p in window.mejs.players ) {
+                                        window.mejs.players[p].pause();
+                                }
+                        }
+
+                        data = window.decodeURIComponent( $( node ).data('wpview-text') );
+                        frame = media.edit( data );
+                        frame.on( 'close', function () {
+                                frame.detach();
+                        } );
+                        frame.state( self.shortcode + '-details' ).on( 'update', function( selection ) {
+                                var shortcode = wp.media[ self.shortcode ].update( selection ).string();
+                                $( node ).attr( 'data-wpview-text', window.encodeURIComponent( shortcode ) );
+                                wp.mce.views.refreshView( self, shortcode );
+                                frame.detach();
+                        } );
+                        frame.open();
+                }
+        };
+
+        wp.mce.media.View = wp.mce.View.extend({
+                initialize: function( options ) {
+                        this.shortcode = options.shortcode;
+                        _.bindAll( this, 'setPlayer' );
+                        $(this).on( 'ready', this.setPlayer );
+                },
+
+                setPlayer: function (e, node) {
+                        // if the ready event fires on an empty node
+                        if ( ! node ) {
+                                return;
+                        }
+
+                        var self = this,
+                                media,
+                                settings = {},
+                                className = '.wp-' +  this.shortcode.tag + '-shortcode';
+
+                        if ( this.player ) {
+                                this.unsetPlayer();
+                        }
+
+                        media = $( node ).find( className );
+
+                        if ( ! _.isUndefined( window._wpmejsSettings ) ) {
+                                settings.pluginPath = _wpmejsSettings.pluginPath;
+                        }
+
+                        if ( ! this.isCompatible( media ) ) {
+                                media.closest( '.wpview-wrap' ).addClass( 'wont-play' );
+                                if ( ! media.parent().hasClass( 'wpview-wrap' ) ) {
+                                        media.parent().replaceWith( media );
+                                }
+                                media.replaceWith( '<p>' + media.find( 'source' ).eq(0).prop( 'src' ) + '</p>' );
+                                return;
+                        } else {
+                                media.closest( '.wpview-wrap' ).removeClass( 'wont-play' );
+                                media.prop( 'preload', 'none' );
+                        }
+
+                        media = wp.media.view.MediaDetails.prepareSrc( media.get(0) );
+
+                        // Thanks, Firefox!
+                        setTimeout(function () {
+                                self.player = new MediaElementPlayer( media, settings );
+                        }, 10);
+                },
+
+                getHtml: function() {
+                        var attrs = this.shortcode.attrs.named;
+                        return this.template({ model: attrs });
+                }
+        });
+        _.extend( wp.mce.media.View.prototype, wp.media.mixin );
+
+        wp.mce.video = _.extend( {}, wp.mce.media, {
+                shortcode: 'video',
+                View: wp.mce.media.View.extend({
+                        className: 'editor-video',
+                        template:  media.template('editor-video')
+                })
+        } );
+
+        wp.mce.views.register( 'video', wp.mce.video );
+
+        wp.mce.audio = _.extend( {}, wp.mce.media, {
+                shortcode: 'audio',
+                View: wp.mce.media.View.extend({
+                        className: 'editor-audio',
+                        template:  media.template('editor-audio')
+                })
+        } );
+
+        wp.mce.views.register( 'audio', wp.mce.audio );
 }(jQuery));

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

@@ -296 +296 @@
                                 attrs[ key ] = false;
                         }
                         return attrs[ key ];
+                },
+
+                isCompatible: function ( media ) {
+                        var ua = window.navigator.userAgent.toLowerCase(),
+                                ff = false, safari = false, chrome = false,
+                                isIE = ua.match(/MSIE/gi),
+                                isOldIE = ua.match(/MSIE [6-8]/gi),
+                                isChrome = ua.match(/safari/gi) !== null && ua.match(/chrome/gi) !== null,
+                                isFirefox = ua.match(/firefox/gi) !== null,
+                                isSafari = ua.match(/safari/gi) !== null && ! ua.match(/chrome/gi);
+
+                        if ( isOldIE || isIE ) {
+                                return false;
+                        }
+
+                        if ( isFirefox || isSafari || isChrome ) {
+                                media.find( 'source' ).each(function (i, elem) {
+                                        if ( elem.type.match(/video\/(ogg|webm)/gi) !== null ||
+                                                ( elem.type.match(/audio\/(ogg|mpeg)/gi) !== null && -1 === elem.src.indexOf('.m4a') ) ) {
+                                                ff = true;
+                                        }
+
+                                        if ( elem.type.match(/video\/(mp4|m4v|mpeg|x-ms-wmv|quicktime)/gi) !== null ||
+                                                ( elem.type.match(/audio\/(mpeg|wav)/gi) !== null ) ) {
+                                                safari = true;
+                                        }
+
+                                        if ( elem.type.match(/video\/(mp4|m4v|mpeg|webm|ogg)/gi) !== null ||
+                                                elem.type.match(/audio\/(ogg|mpeg|x-ms-wma)/gi) !== null ) {
+                                                chrome = true;
+                                        }
+                                });
+
+                                return ( isSafari && safari ) || ( isFirefox && ff ) || ( isChrome && chrome );
+
+                        } else {
+                                return true;
+                        }
+
+                        return false;
+                },
+
+                pauseAllPlayers: function () {
+                        var p;
+                        if ( window.mejs && window.mejs.players ) {
+                                for ( p in window.mejs.players ) {
+                                        window.mejs.players[p].pause();
+                                }
+                        }
+                },
+
+                /**
+                 * Override the MediaElement method for removing a player.
+                 *      MediaElement tries to pull the audio/video tag out of
+                 *      its container and re-add it to the DOM.
+                 */
+                removePlayer: function() {
+                        var t = this.player, featureIndex, feature;
+
+                        // invoke features cleanup
+                        for ( featureIndex in t.options.features ) {
+                                feature = t.options.features[featureIndex];
+                                if ( t['clean' + feature] ) {
+                                        try {
+                                                t['clean' + feature](t);
+                                        } catch (e) {}
+                                }
+                        }
+
+                        if ( ! t.isDynamic ) {
+                                t.$node.remove();
+                        }
+
+                        if ( 'native' !== t.media.pluginType ) {
+                                t.media.remove();
+                        }
+
+                        delete window.mejs.players[t.id];
+
+                        t.container.remove();
+                        t.globalUnbind();
+                        delete t.node.player;
+                },
+
+                unsetPlayer : function() {
+                        if ( this.player ) {
+                                this.pauseAllPlayers();
+                                this.removePlayer();
+                                this.player = false;
+                        }
                 }
         };
 
@@ -302 +392 @@
         wp.media.collection = function(attributes) {
                 var collections = {};
 
-                return _.extend( attributes, wp.media.mixin, {
+                return _.extend( attributes, {
+                        coerce : wp.media.mixin.coerce,
+
                         /**
                          * Retrieve attachments based on the properties of the passed shortcode
                          *
@@ -558 +650 @@
         /**
          * @namespace
          */
-        wp.media.audio = _.extend({
+        wp.media.audio = {
+                coerce : wp.media.mixin.coerce,
+
                 defaults : {
                         id : wp.media.view.settings.post.id,
                         src      : '',
@@ -581 +675 @@
                         return frame;
                 },
 
-                shortcode : function (shortcode) {
-                        var self = this;
+                update : function (model) {
+                        var self = this, content;
 
-                        _.each( wp.media.audio.defaults, function( value, key ) {
-                                shortcode[ key ] = self.coerce( shortcode, key );
+                        _.each( this.defaults, function( value, key ) {
+                                model[ key ] = self.coerce( model, key );
 
-                                if ( value === shortcode[ key ] ) {
-                                        delete shortcode[ key ];
+                                if ( value === model[ key ] ) {
+                                        delete model[ key ];
                                 }
                         });
 
-                        return wp.shortcode.string({
-                                tag:     'audio',
-                                attrs:   shortcode
+                        content = model.content;
+                        delete model.content;
+
+                        return new wp.shortcode({
+                                tag: 'audio',
+                                attrs: model,
+                                content: content
                         });
                 }
-        }, wp.media.mixin);
+        };
 
         /**
          * @namespace
          */
-        wp.media.video = _.extend({
+        wp.media.video = {
+                coerce : wp.media.mixin.coerce,
+
                 defaults : {
                         id : wp.media.view.settings.post.id,
                         src : '',
@@ -631 +731 @@
                         return frame;
                 },
 
-                shortcode : function (shortcode) {
-                        var self = this, content = shortcode.content;
-                        delete shortcode.content;
+                update : function (model) {
+                        var self = this, content = '';
 
                         _.each( this.defaults, function( value, key ) {
-                                shortcode[ key ] = self.coerce( shortcode, key );
+                                model[ key ] = self.coerce( model, key );
 
-                                if ( value === shortcode[ key ] ) {
-                                        delete shortcode[ key ];
+                                if ( value === model[ key ] ) {
+                                        delete model[ key ];
                                 }
                         });
 
-                        return wp.shortcode.string({
-                                tag:     'video',
-                                attrs:   shortcode,
+                        content = model.content;
+                        delete model.content;
+
+                        return new wp.shortcode({
+                                tag: 'video',
+                                attrs: model,
                                 content: content
                         });
                 }
-        }, wp.media.mixin);
+        };
 
         /**
          * wp.media.featuredImage
@@ -1111 +1213 @@
                  * @global wp.media.view.l10n
                  */
                 init: function() {
-                        $(document.body).on( 'click', '.insert-media', function( event ) {
-                                var elem = $( event.currentTarget ),
-                                        editor = elem.data('editor'),
-                                        options = {
-                                                frame:    'post',
-                                                state:    'insert',
-                                                title:    wp.media.view.l10n.addMedia,
-                                                multiple: true
-                                        };
+                        $(document.body)
+                                .on( 'click', '.insert-media', function( event ) {
+                                        var elem = $( event.currentTarget ),
+                                                editor = elem.data('editor'),
+                                                options = {
+                                                        frame:    'post',
+                                                        state:    'insert',
+                                                        title:    wp.media.view.l10n.addMedia,
+                                                        multiple: true
+                                                };
 
-                                event.preventDefault();
+                                        event.preventDefault();
 
-                                // Remove focus from the `.insert-media` button.
-                                // Prevents Opera from showing the outline of the button
-                                // above the modal.
-                                //
-                                // See: http://core.trac.wordpress.org/ticket/22445
-                                elem.blur();
+                                        // Remove focus from the `.insert-media` button.
+                                        // Prevents Opera from showing the outline of the button
+                                        // above the modal.
+                                        //
+                                        // See: http://core.trac.wordpress.org/ticket/22445
+                                        elem.blur();
 
-                                if ( elem.hasClass( 'gallery' ) ) {
-                                        options.state = 'gallery';
-                                        options.title = wp.media.view.l10n.createGalleryTitle;
-                                } else if ( elem.hasClass( 'playlist' ) ) {
-                                        options.state = 'playlist';
-                                        options.title = wp.media.view.l10n.createPlaylistTitle;
-                                } else if ( elem.hasClass( 'video-playlist' ) ) {
-                                        options.state = 'video-playlist';
-                                        options.title = wp.media.view.l10n.createVideoPlaylistTitle;
-                                }
+                                        if ( elem.hasClass( 'gallery' ) ) {
+                                                options.state = 'gallery';
+                                                options.title = wp.media.view.l10n.createGalleryTitle;
+                                        } else if ( elem.hasClass( 'playlist' ) ) {
+                                                options.state = 'playlist';
+                                                options.title = wp.media.view.l10n.createPlaylistTitle;
+                                        } else if ( elem.hasClass( 'video-playlist' ) ) {
+                                                options.state = 'video-playlist';
+                                                options.title = wp.media.view.l10n.createVideoPlaylistTitle;
+                                        }
 
-                                wp.media.editor.open( editor, options );
-                        });
+                                        wp.media.editor.open( editor, options );
+                                })
+                                .on( 'click', '.wp-switch-editor', function () {
+                                        var p;
+                                        if ( window.mejs && window.mejs.players ) {
+                                                for ( p in window.mejs.players ) {
+                                                        window.mejs.players[p].pause();
+                                                }
+                                        }
+                                } );
 
                         // Initialize and render the Editor drag-and-drop uploader.
                         new wp.media.view.EditorUploader().render();

src/wp-includes/js/media-models.js

@@ -467 +467 @@
                         this.attachment = attachment;
                         this.extension = attachment.get('filename' ).split('.').pop();
 
+                        this.unset( 'src' );
                         if ( _.contains( wp.media.view.settings.embedExts, this.extension ) ) {
                                 this.set( this.extension, this.attachment.get( 'url' ) );
                         } else {

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

@@ -6520 +6520 @@
          */
         media.view.MediaDetails = media.view.Settings.AttachmentDisplay.extend({
                 initialize: function() {
-                        _.bindAll(this, 'success', 'unsetPlayer');
-
                         this.listenTo( this.controller, 'close', this.unsetPlayer );
                         this.on( 'ready', this.setPlayer );
                         this.on( 'media:setting:remove', this.unsetPlayer );
@@ -6542 +6540 @@
                         }, this.options );
                 },
 
-                /**
-                 * When multiple players in the DOM contain the same src, things get weird.
-                 *
-                 * @param {HTMLElement} media
-                 * @returns {HTMLElement}
-                 */
-                prepareSrc : function (media) {
-                        var i = wp.media.view.MediaDetails.instances++;
-                        _.each( $(media).find('source'), function (source) {
-                                source.src = [
-                                        source.src,
-                                        source.src.indexOf('?') > -1 ? '&' : '?',
-                                        '_=',
-                                        i
-                                ].join('');
-                        });
-
-                        return media;
-                },
-
                 removeSetting : function (e) {
                         var wrap = $( e.currentTarget ).parent(), setting;
 
@@ -6599 +6577 @@
                         return this;
                 },
 
-                /**
-                 * Override the MediaElement method for removing a player.
-                 *      MediaElement tries to pull the audio/video tag out of
-                 *      its container and re-add it to the DOM.
-                 */
-                removePlayer: function() {
-                        var t = this.player, featureIndex, feature;
-
-                        // invoke features cleanup
-                        for ( featureIndex in t.options.features ) {
-                                feature = t.options.features[featureIndex];
-                                if ( t['clean' + feature] ) {
-                                        try {
-                                                t['clean' + feature](t);
-                                        } catch (e) {}
-                                }
-                        }
-
-                        if ( ! t.isDynamic ) {
-                                t.$node.remove();
-                        }
-
-                        if ( 'native' !== t.media.pluginType ) {
-                                t.media.remove();
-                        }
-
-                        delete window.mejs.players[t.id];
-
-                        t.container.remove();
-                        t.globalUnbind();
-                        delete t.node.player;
-                },
-
-                unsetPlayer : function() {
-                        if ( this.player ) {
-                                if ( _.isUndefined( this.mejs.pluginType ) ) {
-                                        this.mejs.pause();
-                                }
-                                this.removePlayer();
-                                this.player = false;
-                        }
-                },
-
                 success : function (mejs) {
                         var autoplay = mejs.attributes.autoplay && 'false' !== mejs.attributes.autoplay;
 
@@ -6675 +6610 @@
                         this.$( '.embed-media-settings' ).scrollTop( 0 );
                 }
         }, {
-                instances : 0
+                instances : 0,
+
+                /**
+                 * When multiple players in the DOM contain the same src, things get weird.
+                 *
+                 * @param {HTMLElement} media
+                 * @returns {HTMLElement}
+                 */
+                prepareSrc : function (media) {
+                        var i = wp.media.view.MediaDetails.instances++;
+                        if ( 0 === i ) {
+                                i = (new Date()).getTime();
+                        }
+                        _.each( $(media).find('source'), function (source) {
+                                source.src = [
+                                        source.src,
+                                        source.src.indexOf('?') > -1 ? '&' : '?',
+                                        '_=',
+                                        i
+                                ].join('');
+                        });
+
+                        return media;
+                }
         });
+        _.extend( media.view.MediaDetails.prototype, media.mixin );
 
         /**
          * wp.media.view.AudioDetails
@@ -6694 +6653 @@
                 template:  media.template('audio-details'),
 
                 setMedia: function() {
-                        var audio = this.$('.wp-audio-shortcode');
+                        var className = '.wp-audio-shortcode',
+                                audio;
 
+                        audio = this.$( className );
+
                         if ( audio.find( 'source' ).length ) {
                                 if ( audio.is(':hidden') ) {
                                         audio.show();
                                 }
-                                this.media = this.prepareSrc( audio.get(0) );
+
+                                audio = audio.get(0);
+
+                                if ( $( className ).length > 0 ) {
+                                        audio = media.view.MediaDetails.prepareSrc( audio );
+                                }
+
+                                this.media = audio;
                         } else {
                                 audio.hide();
                                 this.media = false;
@@ -6726 +6695 @@
                 template:  media.template('video-details'),
 
                 setMedia: function() {
-                        var video = this.$('.wp-video-shortcode');
+                        var className = '.wp-video-shortcode',
+                                video,
+                                yt;
 
+                        video = this.$( className );
+                        yt = video.hasClass('youtube-video');
+
                         if ( video.find( 'source' ).length ) {
                                 if ( video.is(':hidden') ) {
                                         video.show();
                                 }
 
-                                if ( ! video.hasClass('youtube-video') ) {
-                                        this.media = this.prepareSrc( video.get(0) );
-                                } else {
-                                        this.media = video.get(0);
+                                video = video.get(0);
+
+                                if ( ! yt ) {
+                                        video = media.view.MediaDetails.prepareSrc( video );
                                 }
+
+                                this.media = video;
                         } else {
                                 video.hide();
                                 this.media = false;

src/wp-includes/js/mediaelement/wp-mediaelement.css

@@ -1 +1 @@
 .mejs-container, .mejs-embed, .mejs-embed body {
-        background: #464646;
+        background: #000;
 }
 
 .mejs-controls .mejs-time-rail .mejs-time-loaded {

src/wp-includes/js/tinymce/plugins/wpgallery/plugin.js

@@ -25 +25 @@
         }
 
         function replaceAVShortcodes( content ) {
-                var testRegex = /\[(video-playlist|audio|video|playlist)[^\]]*\]/,
-                        replaceRegex = /\[(video-playlist|audio|video|playlist)[^\]]*\]([\s\S]*?\[\/\1\])?/;
+                var testRegex = /\[(video-playlist|playlist)[^\]]*\]/,
+                        replaceRegex = /\[(video-playlist|playlist)[^\]]*\]([\s\S]*?\[\/\1\])?/;
 
                 while ( testRegex.test( content ) ) {
                         content = content.replace( replaceRegex, replaceCallback );
@@ -92 +92 @@
                                 editor.dom.setAttrib( node, 'data-wp-media', window.encodeURIComponent( shortcode ) );
                                 frame.detach();
                         });
-                } else if ( editor.dom.hasClass( node, 'wp-video' ) ) {
-                        frame = wp.media.video.edit( data );
-                        frame.on( 'close', function () {
-                                frame.detach();
-                        } );
-                        frame.state( 'video-details' ).on(
-                                'update replace add-source select-poster-image add-track',
-                                function ( selection ) {
-                                        var shortcode = wp.media.video.shortcode( selection );
-                                        editor.dom.setAttrib( node, 'data-wp-media', window.encodeURIComponent( shortcode ) );
-                                        frame.detach();
-                                }
-                        );
-                        frame.open();
-                } else if ( editor.dom.hasClass( node, 'wp-audio' ) ) {
-                        frame = wp.media.audio.edit( data );
-                        frame.on( 'close', function () {
-                                frame.detach();
-                        } );
-                        frame.state( 'audio-details' ).on( 'update replace add-source', function ( selection ) {
-                                var shortcode = wp.media.audio.shortcode( selection );
-                                editor.dom.setAttrib( node, 'data-wp-media', window.encodeURIComponent( shortcode ) );
-                                frame.detach();
-                        } );
-                        frame.open();
                 } else {
                         // temp
                         window.console && window.console.log( 'Edit AV shortcode ' + data );

src/wp-includes/js/tinymce/skins/wordpress/wp-content.css

@@ -235 +235 @@
 }
 
 /**
- * Gallery preview
+ * Media previews
  */
-.wpview-type-gallery {
+.wpview-type-gallery,
+.wpview-type-audio,
+.wpview-type-video {
     position: relative;
     padding: 0 0 12px;
     margin-bottom: 16px;
@@ -244 +246 @@
         cursor: pointer;
 }
 
- .wpview-type-gallery:after {
+.wpview-type-audio {
+    padding: 32px 0 0;
+}
+
+.wpview-type-video {
+    padding: 16px 0 0;
+}
+
+.wont-play {
+        padding: 8px 0;
+}
+
+.wont-play p {
+        display: block;
+        width: 80%;
+        margin: 0 5% 0 15%;
+}
+
+audio,
+video,
+embed {
+        display: -moz-inline-stack;
+    display: inline-block;
+        max-width: 100%;
+}
+
+.wpview-type-gallery:after {
     content: '';
     display: block;
     height: 0;
@@ -252 +280 @@
     visibility: hidden;
 }
 
- .wpview-type-gallery.selected {
+.wpview-type-gallery.selected {
         background-color: #efefef;
 }
 
-.wpview-type-gallery .toolbar {
+.wpview-type-audio,
+.wpview-type-video {
+        background-color: #efefef;
+}
+
+.wpview-type-gallery .toolbar,
+.wpview-type-audio .toolbar,
+.wpview-type-video .toolbar {
     position: absolute;
     top: 0;
     left: 0;
@@ -264 +299 @@
     color: white;
     padding: 4px;
         display: none;
+        z-index: 100;
 }
 
+.wpview-type-audio .toolbar,
+.wpview-type-video .toolbar {
+        display: block;
+}
+
 .wpview-type-gallery.selected .toolbar {
         display: block;
 }
 
-.wpview-type-gallery .toolbar span {
+.wpview-type-gallery .toolbar span,
+.wpview-type-audio .toolbar span
+.wpview-type-video .toolbar span {
         cursor: pointer;
 }
 

src/wp-includes/media-template.php

@@ -8 +8 @@
  */
 
 /**
+ * Output the markup for a audio tag to be used in an Underscore template
+ *      when data.model is passed.
+ *
+ * @since 3.9.0
+ */
+function wp_underscore_audio_template() {
+        $audio_types = wp_get_audio_extensions();
+?>
+<audio controls
+        class="wp-audio-shortcode"
+        preload="{{ _.isUndefined( data.model.preload ) ? 'none' : data.model.preload }}"
+        <#
+        <?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
+        ?>if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
+                #> <?php echo $attr ?><#
+        }
+        <?php endforeach ?>#>
+>
+        <# if ( ! _.isEmpty( data.model.src ) ) { #>
+        <source src="{{ data.model.src }}" type="{{ wp.media.view.settings.embedMimes[ data.model.src.split('.').pop() ] }}" />
+        <# } #>
+
+        <?php foreach ( $audio_types as $type ):
+        ?><# if ( ! _.isEmpty( data.model.<?php echo $type ?> ) ) { #>
+        <source src="{{ data.model.<?php echo $type ?> }}" type="{{ wp.media.view.settings.embedMimes[ '<?php echo $type ?>' ] }}" />
+        <# } #>
+        <?php endforeach;
+?></audio>
+<?php
+}
+
+/**
+ * Output the markup for a video tag to be used in an Underscore template
+ *      when data.model is passed.
+ *
+ * @since 3.9.0
+ */
+function wp_underscore_video_template( $onload = false ) {
+        $video_types = wp_get_video_extensions();
+?>
+<#
+var isYouTube = ! _.isEmpty( data.model.src ) && data.model.src.match(/youtube|youtu\.be/);
+        w = ! data.model.width || data.model.width > 640 ? 640 : data.model.width,
+        h = ! data.model.height ? 360 : data.model.height;
+
+if ( data.model.width && w !== data.model.width ) {
+        h = Math.ceil( ( h * w ) / data.model.width );
+}
+#>
+<div style="max-width: 100%; width: {{ w }}px">
+<video controls
+        class="wp-video-shortcode{{ isYouTube ? ' youtube-video' : '' }}"
+        width="{{ w }}"
+        height="{{ h }}"
+        <?php
+        $props = array( 'poster' => '', 'preload' => 'metadata' );
+        foreach ( $props as $key => $value ):
+                if ( empty( $value ) ) {
+                ?><#
+                if ( ! _.isUndefined( data.model.<?php echo $key ?> ) && data.model.<?php echo $key ?> ) {
+                        #> <?php echo $key ?>="{{ data.model.<?php echo $key ?> }}"<#
+                } #>
+                <?php } else {
+                        echo $key ?>="{{ _.isUndefined( data.model.<?php echo $key ?> ) ? '<?php echo $value ?>' : data.model.<?php echo $key ?> }}"<?php
+                }
+        endforeach;
+        ?><#
+        <?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
+        ?> if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
+                #> <?php echo $attr ?><#
+        }
+        <?php endforeach ?>#>
+>
+        <# if ( ! _.isEmpty( data.model.src ) ) {
+                if ( isYouTube ) { #>
+                <source src="{{ data.model.src }}" type="video/youtube" />
+                <# } else { #>
+                <source src="{{ data.model.src }}" type="{{ wp.media.view.settings.embedMimes[ data.model.src.split('.').pop() ] }}" />
+                <# }
+        } #>
+
+        <?php foreach ( $video_types as $type ):
+        ?><# if ( data.model.<?php echo $type ?> ) { #>
+        <source src="{{ data.model.<?php echo $type ?> }}" type="{{ wp.media.view.settings.embedMimes[ '<?php echo $type ?>' ] }}" />
+        <# } #>
+        <?php endforeach; ?>
+        {{{ data.model.content }}}
+</video>
+</div>
+<?php
+}
+
+/**
  * Prints the templates used in the media manager.
  *
  * @since 3.5.0
@@ -676 +769 @@
                 <div class="media-embed media-embed-details">
                         <div class="embed-media-settings embed-audio-settings">
                                 <div class="instructions media-instructions">{{{ wp.media.view.l10n.audioDetailsText }}}</div>
-                                <audio controls
-                                        class="wp-audio-shortcode"
-                                        preload="{{ _.isUndefined( data.model.preload ) ? 'none' : data.model.preload }}"
-                                        <#
-                                        <?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
-                                        ?>if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
-                                                #> <?php echo $attr ?><#
-                                        }
-                                        <?php endforeach ?>#>
-                                >
-                                        <# if ( ! _.isEmpty( data.model.src ) ) { #>
-                                        <source src="{{ data.model.src }}" type="{{ wp.media.view.settings.embedMimes[ data.model.src.split('.').pop() ] }}" />
-                                        <# } #>
-
-                                        <?php foreach ( $audio_types as $type ):
-                                        ?><# if ( ! _.isEmpty( data.model.<?php echo $type ?> ) ) { #>
-                                        <source src="{{ data.model.<?php echo $type ?> }}" type="{{ wp.media.view.settings.embedMimes[ '<?php echo $type ?>' ] }}" />
-                                        <# } #>
-                                        <?php endforeach;
-                                ?></audio>
+                                <?php wp_underscore_audio_template() ?>
                                 <# if ( ! _.isEmpty( data.model.src ) ) { #>
                                 <label class="setting">
                                         <span>SRC</span>
@@ -738 +812 @@
                 </div>
         </script>
 
+        <script type="text/html" id="tmpl-editor-audio">
+                <div class="toolbar">
+                        <div class="dashicons dashicons-format-audio edit"></div>
+                        <div class="dashicons dashicons-no-alt remove"></div>
+                </div>
+                <?php wp_underscore_audio_template() ?>
+        </script>
+
         <script type="text/html" id="tmpl-video-details">
                 <?php $video_types = wp_get_video_extensions(); ?>
                 <div class="media-embed media-embed-details">
@@ -744 +826 @@
                         <div class="embed-media-settings embed-video-settings">
                                 <div class="instructions media-instructions">{{{ wp.media.view.l10n.videoDetailsText }}}</div>
                                 <div class="wp-video-holder">
-                                <#
-                                var isYouTube = ! _.isEmpty( data.model.src ) && data.model.src.match(/youtube|youtu\.be/);
-                                        w = ! data.model.width || data.model.width > 640 ? 640 : data.model.width,
-                                        h = ! data.model.height ? 360 : data.model.height;
-
-                                if ( data.model.width && w !== data.model.width ) {
-                                        h = Math.ceil( ( h * w ) / data.model.width );
-                                }
-
-                                #>
-                                <video controls
-                                        class="wp-video-shortcode{{ isYouTube ? ' youtube-video' : '' }}"
-                                        width="{{ w }}"
-                                        height="{{ h }}"
-                                        <?php
-                                        $props = array( 'poster' => '', 'preload' => 'metadata' );
-                                        foreach ( $props as $key => $value ):
-                                                if ( empty( $value ) ) {
-                                                ?><#
-                                                if ( ! _.isUndefined( data.model.<?php echo $key ?> ) && data.model.<?php echo $key ?> ) {
-                                                        #> <?php echo $key ?>="{{ data.model.<?php echo $key ?> }}"<#
-                                                } #>
-                                                <?php } else {
-                                                        echo $key ?>="{{ _.isUndefined( data.model.<?php echo $key ?> ) ? '<?php echo $value ?>' : data.model.<?php echo $key ?> }}"<?php
-                                                }
-                                        endforeach;
-                                        ?><#
-                                        <?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
-                                        ?> if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
-                                                #> <?php echo $attr ?><#
-                                        }
-                                        <?php endforeach ?>#>
-                                >
-                                        <# if ( ! _.isEmpty( data.model.src ) ) {
-                                                if ( isYouTube ) { #>
-                                                <source src="{{ data.model.src }}" type="video/youtube" />
-                                                <# } else { #>
-                                                <source src="{{ data.model.src }}" type="{{ wp.media.view.settings.embedMimes[ data.model.src.split('.').pop() ] }}" />
-                                                <# }
-                                        } #>
-
-                                        <?php foreach ( $video_types as $type ):
-                                        ?><# if ( data.model.<?php echo $type ?> ) { #>
-                                        <source src="{{ data.model.<?php echo $type ?> }}" type="{{ wp.media.view.settings.embedMimes[ '<?php echo $type ?>' ] }}" />
-                                        <# } #>
-                                        <?php endforeach; ?>
-                                        {{{ data.model.content }}}
-                                </video>
+                                <?php wp_underscore_video_template() ?>
                                 <# if ( ! _.isEmpty( data.model.src ) ) { #>
                                 <label class="setting">
                                         <span>SRC</span>
@@ -857 +892 @@
                         </div>
                 </div>
         </script>
+
+        <script type="text/html" id="tmpl-editor-video">
+                <div class="toolbar">
+                        <div class="dashicons dashicons-format-video edit"></div>
+                        <div class="dashicons dashicons-no-alt remove"></div>
+                </div>
+                <?php wp_underscore_video_template() ?>
+        </script>
         <?php
 
                 //TODO: do we want to deal with the fact that the elements used for gallery items are filterable and can be overriden via shortcode attributes