From 976687bc59e9e9c9fe89767efd5cfb061db87625 Mon Sep 17 00:00:00 2001
From: Ella Iseulde Van Dorpe <iseulde@git.wordpress.org>
Date: Wed, 29 Jul 2015 22:48:02 +0000
Subject: [PATCH] TinyMCE: wptextpattern: reorder undo

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

See #31441.


git-svn-id: https://develop.svn.wordpress.org/trunk@33507 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../tinymce/plugins/wptextpattern/plugin.js   | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js b/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js
index 76767d0f9f..23a41674a0 100644
--- a/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js
@@ -25,7 +25,8 @@
 				{ start: '#####', format: 'h5' },
 				{ start: '######', format: 'h6' },
 				{ start: '>', format: 'blockquote' }
-			];
+			],
+			refNode, refPattern;
 
 		editor.on( 'selectionchange', function() {
 			canUndo = false;
@@ -38,13 +39,17 @@
 			}
 
 			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();
+				}
 			}
 		} );
 
@@ -117,7 +122,7 @@
 			} );
 		}
 
-		function enter() {
+		function watchEnter() {
 			var selection = editor.selection,
 				rng = selection.getRng(),
 				offset = rng.startOffset,
@@ -151,17 +156,22 @@
 				offset = Math.max( 0, offset - pattern.start.length );
 			}
 
-			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;
 		}
 	} );
 } )( window.tinymce, window.setTimeout );