Ticket #28195: 28195.15.patch

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

@@ -52 +52 @@
                                 '<ins data-wpview-end="1"></ins>',
                                 function( self, editor, node ) {
                                         $( self ).trigger( 'ready', [ editor, node ] );
-                                }
+                                },
+                                'wrap'
                         );
                 },
                 unbind: function() {},
-                setContent: function( html, callback, replace ) {
+                setContent: function( html, callback, option ) {
                         _.each( tinymce.editors, function( editor ) {
                                 var self = this;
                                 if ( editor.plugins.wpview ) {
@@ -66 +67 @@
                                                 var contentWrap = $( element ).children( '.wpview-content' ),
                                                         wrap = element;
 
-                                                if ( contentWrap.length ) {
+                                                if ( contentWrap.length && option !== 'wrap' ) {
                                                         element = contentWrap = contentWrap[0];
                                                 }
 
                                                 if ( _.isString( html ) ) {
-                                                        if ( replace ) {
+                                                        if ( option === 'replace' ) {
                                                                 element = editor.dom.replace( editor.dom.createFragment( html ), wrap );
                                                         } else {
                                                                 editor.dom.setHTML( element, html );
                                                         }
                                                 } else {
-                                                        if ( replace ) {
+                                                        if ( option === 'replace' ) {
                                                                 element = editor.dom.replace( html, wrap );
                                                         } else {
                                                                 element.appendChild( html );
@@ -729 +730 @@
                                         if ( self.type === 'embed' ) {
                                                 self.setError( self.original + ' failed to embed.', 'admin-media' );
                                         } else {
-                                                self.setContent( self.original, null, true );
+                                                self.setContent( self.original, null, 'replace' );
                                         }
                                 } else {
                                         self.parsed = content;