Ticket #31441: 31441.29.patch

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

@@ -13 +13 @@
 ( function( tinymce, setTimeout ) {
         tinymce.PluginManager.add( 'wptextpattern', function( editor ) {
                 var VK = tinymce.util.VK,
-                        canUndo = false,
                         spacePatterns = [
                                 { regExp: /^[*-]\s/, cmd: 'InsertUnorderedList' },
                                 { regExp: /^1[.)]\s/, cmd: 'InsertOrderedList' }
@@ -26 +25 @@
                                 { start: '######', format: 'h6' },
                                 { start: '>', format: 'blockquote' }
                         ],
+                        canUndoSpace, canUndoEnter,
                         refNode, refPattern;
 
                 editor.on( 'selectionchange', function() {
-                        canUndo = false;
+                        canUndoSpace = null;
+                        canUndoEnter = null;
                 } );
 
                 editor.on( 'keydown', function( event ) {
-                        if ( canUndo && ( event.keyCode === VK.BACKSPACE || event.keyCode === 27 /* ESCAPE */ ) ) {
+                        if (
+                                ( ( canUndoSpace || canUndoEnter ) && event.keyCode === 27 /* ESCAPE */ ) ||
+                                ( canUndoSpace && event.keyCode === VK.BACKSPACE )
+                        ) {
                                 editor.undoManager.undo();
                                 event.preventDefault();
                         }
@@ -115 +119 @@
 
                                 // We need to wait for native events to be triggered.
                                 setTimeout( function() {
-                                        canUndo = true;
+                                        canUndoSpace = true;
                                 } );
 
                                 return false;
@@ -168 +172 @@
                                         editor.formatter.apply( refPattern.format, {}, refNode );
                                         refNode.deleteData( 0, refPattern.start.length );
                                 } );
+
+                                // We need to wait for native events to be triggered.
+                                setTimeout( function() {
+                                        canUndoEnter = true;
+                                } );
                         }
 
                         refNode = null;