Ticket #27899: 27899.3.diff

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

@@ -451 +451 @@
                                 firefox = this.ua.is( 'ff' ),
                                 className = '.wp-' +  this.shortcode.tag + '-shortcode';
 
-                        if ( this.player ) {
-                                this.unsetPlayer();
-                        }
-
                         media = $( node ).find( className );
 
                         if ( ! this.isCompatible( media ) ) {
@@ -495 +491 @@
                 },
 
                 unbind: function() {
-                        var self = this;
-                        this.pauseAllPlayers();
-                        _.each( this.players, function (player) {
-                                self.removePlayer( player );
-                        } );
-                        this.players = [];
+                        this.unsetPlayers();
                 }
         });
         _.extend( wp.mce.media.View.prototype, wp.media.mixin );
@@ -547 +538 @@
                 template:  media.template('editor-playlist'),
 
                 initialize: function( options ) {
+                        this.players = [];
                         this.data = {};
                         this.attachments = [];
                         this.shortcode = options.shortcode;
-                        _.bindAll( this, 'setPlayer' );
-                        $(this).on('ready', this.setNode);
-                },
-
-                /**
-                 * Set the element context for the view, and then fetch the playlist's
-                 *   associated attachments.
-                 *
-                 * @param {Event} e
-                 * @param {HTMLElement} node
-                 */
-                setNode: function(e, node) {
-                        this.node = node;
                         this.fetch();
                 },
 
@@ -571 +550 @@
                  */
                 fetch: function() {
                         this.attachments = wp.media.playlist.attachments( this.shortcode );
-                        this.attachments.more().done( this.setPlayer );
+                        this.dfd = this.attachments.more().done( _.bind( this.render, this ) );
                 },
 
                 /**
@@ -582 +561 @@
                  * @global WPPlaylistView
                  * @global tinymce.editors
                  */
-                setPlayer: function() {
-                        var p,
-                                html = this.getHtml(),
-                                t = this.encodedText,
-                                self = this;
-
-                        this.unsetPlayer();
+                render: function() {
+                        var html = this.getHtml(), self = this;
 
                         _.each( tinymce.editors, function( editor ) {
                                 var doc;
                                 if ( editor.plugins.wpview ) {
                                         doc = editor.getDoc();
-                                        $( doc ).find( '[data-wpview-text="' + t + '"]' ).each(function(i, elem) {
+                                        $( doc ).find( '[data-wpview-text="' + this.encodedText + '"]' ).each(function (i, elem) {
                                                 var node = $( elem );
-                                                node.html( html );
-                                                self.node = elem;
-                                        });
-                                }
-                        }, this );
 
-                        if ( ! this.data.tracks ) {
-                                return;
-                        }
+                                                // The <ins> is used to mark the end of the wrapper div. Needed when comparing
+                                                // the content as string for preventing extra undo levels.
+                                                node.html( html ).append( '<ins data-wpview-end="1"></ins>' );
 
-                        p = new WPPlaylistView({
-                                el: $( self.node ).find( '.wp-playlist' ).get(0),
-                                metadata: this.data
-                        });
+                                                if ( ! self.data.tracks ) {
+                                                        return;
+                                                }
 
-                        this.player = p.player;
+                                                self.players.push( new WPPlaylistView({
+                                                        el: $( elem ).find( '.wp-playlist' ).get(0),
+                                                        metadata: self.data
+                                                }).player );
+                                        });
+                                }
+                        }, this );
                 },
 
                 /**
@@ -695 +669 @@
                         this.data = options;
 
                         return this.template( options );
+                },
+
+                unbind: function() {
+                        this.unsetPlayers();
                 }
         });
         _.extend( wp.mce.media.PlaylistView.prototype, wp.media.mixin );

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

@@ -162 +162 @@
                  *
                  *  Examples: modal closes, shortcode properties are removed, etc.
                  */
-                unsetPlayer : function() {
-                        if ( this.player ) {
+                unsetPlayers : function() {
+                        if ( this.players && this.players.length ) {
                                 wp.media.mixin.pauseAllPlayers();
-                                wp.media.mixin.removePlayer( this.player );
-                                this.player = false;
+                                _.each( this.players, function (player) {
+                                        wp.media.mixin.removePlayer( player );
+                                } );
+                                this.players = [];
                         }
                 }
         };
@@ -705 +707 @@
         media.view.MediaDetails = media.view.Settings.AttachmentDisplay.extend({
                 initialize: function() {
                         _.bindAll(this, 'success');
-
-                        this.listenTo( this.controller, 'close', media.mixin.unsetPlayer );
+                        this.players = [];
+                        this.listenTo( this.controller, 'close', media.mixin.unsetPlayers );
                         this.on( 'ready', this.setPlayer );
-                        this.on( 'media:setting:remove', media.mixin.unsetPlayer, this );
+                        this.on( 'media:setting:remove', media.mixin.unsetPlayers, this );
                         this.on( 'media:setting:remove', this.render );
                         this.on( 'media:setting:remove', this.setPlayer );
                         this.events = _.extend( this.events, {
@@ -764 +766 @@
                  * @global MediaElementPlayer
                  */
                 setPlayer : function() {
-                        if ( ! this.player && this.media ) {
-                                this.player = new MediaElementPlayer( this.media, this.settings );
+                        if ( ! this.players.length && this.media ) {
+                                this.players.push( new MediaElementPlayer( this.media, this.settings ) );
                         }
                 },
 

src/wp-includes/media-template.php

@@ -16 +16 @@
 function wp_underscore_audio_template() {
         $audio_types = wp_get_audio_extensions();
 ?>
-<audio controls
+<audio style="visibility: hidden"
+        controls
         class="wp-audio-shortcode"
         width="{{ _.isUndefined( data.model.width ) ? 400 : data.model.width }}"
         preload="{{ _.isUndefined( data.model.preload ) ? 'none' : data.model.preload }}"

src/wp-includes/media.php

@@ -1353 +1353 @@
                 echo (int) $theme_width;
         ?>"<?php if ( 'video' === $safe_type ):
                 echo ' height="', (int) $theme_height, '"';
+        else:
+                echo ' style="visibility: hidden"';
         endif; ?>></<?php echo $safe_type ?>>
         <div class="wp-playlist-next"></div>
         <div class="wp-playlist-prev"></div>
@@ -1555 +1557 @@
                 'loop'     => $loop,
                 'autoplay' => $autoplay,
                 'preload'  => $preload,
-                'style'    => 'width: 100%',
+                'style'    => 'width: 100%; visibility: hidden;',
         );
 
         // These ones should just be omitted altogether if they are blank