Changeset 33507

Timestamp:

07/29/2015 10:48:02 PM (10 years ago)

Author:

iseulde

Message:

TinyMCE: wptextpattern: reorder undo

After formatting on enter, undo should undo the formatting first, then undo the new line.

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

@@ -26 +26 @@
                 { start: '######', format: 'h6' },
                 { start: '>', format: 'blockquote' }
-            ];
+            ],
+            refNode, refPattern;
 
         editor.on( 'selectionchange', function() {
@@ -39 +40 @@
 
             if ( event.keyCode === VK.ENTER && ! VK.modifierPressed( event ) ) {
-                enter();
+                watchEnter();
             }
         }, true );
 
         editor.on( 'keyup', function( event ) {
-            if ( event.keyCode === VK.SPACEBAR && ! VK.modifierPressed( event ) ) {
-                space();
+            if ( ! VK.modifierPressed( event ) ) {
+                if ( event.keyCode === VK.SPACEBAR ) {
+                    space();
+                } else if ( event.keyCode === VK.ENTER ) {
+                    enter();
+                }
             }
         } );
@@ -118 +123 @@
         }
 
-        function enter() {
+        function watchEnter() {
             var selection = editor.selection,
                 rng = selection.getRng(),
@@ -152 +157 @@
             }
 
-            editor.undoManager.add();
+            refNode = node;
+            refPattern = pattern;
+        }
 
-            editor.undoManager.transact( function() {
-                node.deleteData( 0, pattern.start.length );
+        function enter() {
+            if ( refNode ) {
+                editor.undoManager.add();
 
-                editor.formatter.apply( pattern.format, {}, start );
+                editor.undoManager.transact( function() {
+                    editor.formatter.apply( refPattern.format, {}, refNode );
+                    refNode.deleteData( 0, refPattern.start.length );
+                } );
+            }
 
-                rng.setStart( start, offset );
-                rng.collapse( true );
-                selection.setRng( rng );
-            } );
+            refNode = null;
+            refPattern = null;
         }
     } );