Ticket #27389: 27389-wpviews-undo-revamp.patch

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

@@ -41 +41 @@
                                         doc = editor.getDoc();
                                         $( doc ).find( '[data-wpview-text="' + this.encodedText + '"]' ).each(function (i, elem) {
                                                 var node = $( elem );
-                                                node.html( html );
+                                                node.html( html ).append( '<span data-wp-view-end class="wp-view-end"></span>' );
                                                 $( self ).trigger( 'ready', elem );
                                         });
                                 }

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

@@ -141 +141 @@
         }
 
         editor.on( 'BeforeAddUndo', function( event ) {
-                if ( selected && ! toRemove ) {
-                        event.preventDefault();
+                var lastLevel = editor.undoManager.data[ editor.undoManager.data.length - 1 ],
+                        replace,
+                        previousContent,
+                        content;
+
+                replace = function( content ) {
+                        return content.replace(/(<div[^>]+wpview-wrap[^>]+>)([^]+)(<span[^>]+data-wp-view-end[^>]+><\/span><\/div>)/mg, '$`$1&nbsp;$3$\'' );
+                };
+
+                if ( lastLevel ) {
+                        previousContent = replace( lastLevel.content );
+                        content = replace( event.level.content );
+
+                        if ( content === previousContent ) {
+                                event.preventDefault();
+                        }
                 }
         });
 
@@ -157 +171 @@
                 e.content = wp.mce.views.toViews( e.content );
         });
 
+        editor.on( 'VisualAid', function() {
+                wp.mce.views.render();
+        });
+
         // When the editor's content has been updated and the DOM has been
         // processed, render the views in the document.
         editor.on( 'SetContent', function( event ) {
                 var body, padNode;
 
-                // don't (re-)render views if the format of the content is raw
-                // to avoid adding additional undo levels on undo/redo
-                if ( event.format !== 'raw' ) {
-                        wp.mce.views.render();
-                }
 
                 // Add padding <p> if the noneditable node is last
                 if ( event.load || ! event.set ) {