Ticket #28788: 28788.2.patch

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

@@ -46 +46 @@
                                         '<div class="wpview-loading"><ins></ins></div>' +
                                 '</div>';
                 },
-                render: function() {
-                        this.setContent(
-                                '<p class="wpview-selection-before">\u00a0</p>' +
-                                '<div class="wpview-body" contenteditable="false">' +
-                                        '<div class="toolbar">' +
-                                                ( _.isFunction( views[ this.type ].edit ) ? '<div class="dashicons dashicons-edit edit"></div>' : '' ) +
-                                                '<div class="dashicons dashicons-no-alt remove"></div>' +
-                                        '</div>' +
-                                        '<div class="wpview-content wpview-type-' + this.type + '">' +
-                                                ( this.getHtml() || this.loadingPlaceholder() ) +
+                render: function( force ) {
+                        if ( force || ! this.rendered() ) {
+                                this.unbind();
+
+                                this.setContent(
+                                        '<p class="wpview-selection-before">\u00a0</p>' +
+                                        '<div class="wpview-body" contenteditable="false">' +
+                                                '<div class="toolbar">' +
+                                                        ( _.isFunction( views[ this.type ].edit ) ? '<div class="dashicons dashicons-edit edit"></div>' : '' ) +
+                                                        '<div class="dashicons dashicons-no-alt remove"></div>' +
+                                                '</div>' +
+                                                '<div class="wpview-content wpview-type-' + this.type + '">' +
+                                                        ( this.getHtml() || this.loadingPlaceholder() ) +
+                                                '</div>' +
+                                                ( this.overlay ? '<div class="wpview-overlay"></div>' : '' ) +
                                         '</div>' +
-                                        ( this.overlay ? '<div class="wpview-overlay"></div>' : '' ) +
-                                '</div>' +
-                                '<p class="wpview-selection-after">\u00a0</p>',
-                                'wrap'
-                        );
+                                        '<p class="wpview-selection-after">\u00a0</p>',
+                                        'wrap'
+                                );
+
+                                $( this ).trigger( 'ready' );
 
-                        $( this ).trigger( 'ready' );
+                                this.rendered( true );
+                        }
                 },
                 unbind: function() {},
                 getEditors: function( callback ) {
@@ -186 +192 @@
                                         '<p>' + message + '</p>' +
                                 '</div>'
                         );
+                },
+                rendered: function( value ) {
+                        var notRendered;
+
+                        this.getNodes( function( editor, node ) {
+                                if ( value != null ) {
+                                        $( node ).data( 'rendered', value === true );
+                                } else {
+                                        notRendered = notRendered || ! $( node ).data( 'rendered' );
+                                }
+                        } );
+
+                        return ! notRendered;
                 }
         } );
 
@@ -386 +405 @@
                                 instances[ encodedText ] = instance;
                         }
 
-                        wp.mce.views.render();
+                        instance.render();
                 },
 
                 getInstance: function( encodedText ) {
@@ -402 +421 @@
                  * To generate wrapper elements, pass your content through
                  * `wp.mce.view.toViews( content )`.
                  */
-                render: function() {
+                render: function( force ) {
                         _.each( instances, function( instance ) {
-                                instance.render();
+                                instance.render( force );
                         } );
                 },
 
@@ -434 +453 @@
                         },
 
                         fetch: function() {
+                                var self = this;
+
                                 this.attachments = wp.media.gallery.attachments( this.shortcode, this.postID );
-                                this.dfd = this.attachments.more().done( _.bind( this.render, this ) );
+                                this.dfd = this.attachments.more().done( function() {
+                                        self.render( true );
+                                } );
                         },
 
                         getHtml: function() {

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

@@ -205 +205 @@
                         removeView( selected );
                 }
 
-                if ( ! event.initial ) {
-                        wp.mce.views.unbind( editor );
-                }
-
                 node = editor.selection.getNode();
 
                 // When a url is pasted, only try to embed it when pasted in an empty paragrapgh.