Changeset 33508

Timestamp:

07/29/2015 11:11:42 PM (8 years ago)

Author:

iseulde

Message:

TinyMCE: wptextpattern: undo on esc after enter

See #31441.

File:

• trunk/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js (modified) (4 diffs)

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

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