Ticket #31669: 31669.3.patch

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

@@ -77 +77 @@
                  */
                 unbind: function() {
                         _.each( instances, function( instance ) {
-                                instance.unbind();
+                                instance.unbindAll();
                         } );
                 },
 
@@ -307 +307 @@
                         }
 
                         // We're about to rerender all views of this instance, so unbind rendered views.
-                        force && this.unbind();
+                        force && this.unbindAll();
 
                         // Replace any left over markers.
                         this.replaceMarkers();
 
                         if ( this.getContent() ) {
                                 this.setContent( this.getContent(), function( editor, node ) {
-                                        $( node ).data( 'rendered', true ).trigger( 'wp-mce-view-bind' );
+                                        $( node ).data( 'rendered', true );
+                                        this.bind.apply( this, arguments );
                                 }, force ? null : false );
                         } else {
                                 this.setLoader();
@@ -322 +323 @@
                 },
 
                 /**
+                 * Binds a given node after its content is added to the DOM.
+                 */
+                bind: function() {},
+
+                /**
+                 * Unbinds a given node before its content is removed from the DOM.
+                 */
+                unbind: function() {},
+
+                /**
                  * Unbinds all view nodes tied to this view instance.
                  * Runs before their content is removed from the DOM.
                  */
-                unbind: function() {
+                unbindAll: function() {
                         this.getNodes( function( editor, node ) {
+                                this.unbind.apply( this, arguments );
                                 $( node ).trigger( 'wp-mce-view-unbind' );
                         }, true );
                 },
@@ -461 +473 @@
                  * @param {Boolean}  rendered Only set for (un)rendered nodes. Optional.
                  */
                 setIframes: function( head, body, callback, rendered ) {
-                        var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;
+                        var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver,
+                                self = this;
 
                         this.getNodes( function( editor, node, content ) {
                                 // Seems Firefox needs a bit of time to insert/set the view nodes,
@@ -582 +595 @@
                                                 editor.off( 'wp-body-class-change', classChange );
                                         } );
 
-                                        callback && callback.apply( this, arguments );
+                                        callback && callback.apply( self, arguments );
                                 }, 50 );
                         }, rendered );
                 },
@@ -663 +676 @@
                  * @param {HTMLElement}    node   The view node to remove.
                  */
                 remove: function( editor, node ) {
+                        this.unbind.call( this, editor, node, $( node ).find( '.wpview-content' ).get( 0 ) );
                         $( node ).trigger( 'wp-mce-view-unbind' );
                         editor.dom.remove( node );
                 }

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

@@ -169 +169 @@
         editor.on( 'BeforeSetContent', function( event ) {
                 var node;
 
+                if ( event.format === 'raw' ) {
+                        wp.mce.views.unbind();
+                }
+
                 if ( ! event.content ) {
                         return;
                 }