Ticket #28458: 28458.2.patch

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

@@ -270 +270 @@
                         };
                 },
                 View: wp.mce.View.extend({
-                        className: 'editor-gallery',
                         template:  media.template('editor-gallery'),
 
                         // The fallback post ID to use as a parent for galleries that don't
@@ -489 +488 @@
                 shortcode: 'video',
                 state: 'video-details',
                 View: wp.mce.media.View.extend({
-                        className: 'editor-video',
                         template:  media.template('editor-video')
                 })
         } );
@@ -504 +502 @@
                 shortcode: 'audio',
                 state: 'audio-details',
                 View: wp.mce.media.View.extend({
-                        className: 'editor-audio',
                         template:  media.template('editor-audio')
                 })
         } );
@@ -518 +515 @@
          * @mixes wp.media.mixin
          */
         wp.mce.media.PlaylistView = wp.mce.View.extend({
-                className: 'editor-playlist',
                 template:  media.template('editor-playlist'),
 
                 initialize: function( options ) {
@@ -531 +527 @@
                         $( document ).on( 'media:edit', this.pausePlayers );
 
                         this.fetch();
+                        
+                        $( this ).on( 'ready', this.setPlaylist );
                 },
 
                 /**
@@ -540 +538 @@
                         this.attachments = wp.media.playlist.attachments( this.shortcode );
                         this.dfd = this.attachments.more().done( _.bind( this.render, this ) );
                 },
+                
+                setPlaylist: function( event, element ) {
+                        if ( ! this.data.tracks ) {
+                                return;
+                        }
 
-                /**
-                 * Get the HTML for the view (which also set's the data), replace the
-                 *   current HTML, and then invoke the WPPlaylistView instance to render
-                 *   the playlist in the editor
-                 *
-                 * @global WPPlaylistView
-                 * @global tinymce.editors
-                 */
-                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="' + this.encodedText + '"]' ).each(function (i, elem) {
-                                                var node = $( elem );
-
-                                                // 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>' );
-
-                                                if ( ! self.data.tracks ) {
-                                                        return;
-                                                }
-
-                                                self.players.push( new WPPlaylistView({
-                                                        el: $( elem ).find( '.wp-playlist' ).get(0),
-                                                        metadata: self.data
-                                                }).player );
-                                        });
-                                }
-                        }, this );
+                        this.players.push( new WPPlaylistView( {
+                                el: $( element ).find( '.wp-playlist' ).get( 0 ),
+                                metadata: this.data
+                        } ).player );
                 },
 
                 /**
@@ -684 +658 @@
                 shortcode: 'embed',
                 toView: wp.mce.gallery.toView,
                 View: wp.mce.View.extend( {
-                        className: 'editor-embed',
                         template: media.template( 'editor-embed' ),
                         initialize: function( options ) {
                                 this.players = [];