TinyMCE: wptextpattern: undo on esc after enter

See #31441.

Built from https://develop.svn.wordpress.org/trunk@33508


git-svn-id: http://core.svn.wordpress.org/trunk@33475 1a063a9b-81f0-0310-95a4-ce76da25c4cd

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

@@ -13,7 +13,6 @@
 ( 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,14 +25,14 @@
 				{ start: '######', format: 'h6' },
 				{ 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();
 			}
@@ -115,7 +114,7 @@
 
 				// We need to wait for native events to be triggered.
 				setTimeout( function() {
-					canUndo = true;
+					canUndo = 'space';
 				} );
 
 				return false;
@@ -168,6 +167,11 @@
 					editor.formatter.apply( refPattern.format, {}, refNode );
 					refNode.deleteData( 0, refPattern.start.length );
 				} );
+
+				// We need to wait for native events to be triggered.
+				setTimeout( function() {
+					canUndo = 'enter';
+				} );
 			}
 
 			refNode = null;

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

@@ -1 +1 @@
-!function(a,b){a.PluginManager.add("wptextpattern",function(c){function d(a){var b,d=c.dom.getParent(a,"p");if(d){for(;(b=d.firstChild)&&3!==b.nodeType;)d=b;if(b)return b.data||(b=b.nextSibling),b}}function e(){var e,f,g=c.selection.getRng(),h=g.startContainer;h&&d(h)===h&&(e=h.parentNode,f=h.data,a.each(l,function(a){var d=f.match(a.regExp);if(d&&g.startOffset===d[0].length)return c.undoManager.add(),c.undoManager.transact(function(){h.deleteData(0,d[0].length),e.innerHTML||e.appendChild(document.createElement("br")),c.selection.setCursorLocation(e),c.execCommand(a.cmd)}),b(function(){k=!0}),!1}))}function f(){var b,e,f=c.selection,g=f.getRng(),j=g.startOffset,k=g.startContainer,l=d(k),n=m.length;if(l){for(b=l.data;n--;)if(0===b.indexOf(m[n].start)){e=m[n];break}if(e){if(l===k){if(a.trim(b)===e.start)return;j=Math.max(0,j-e.start.length)}h=l,i=e}}}function g(){h&&(c.undoManager.add(),c.undoManager.transact(function(){c.formatter.apply(i.format,{},h),h.deleteData(0,i.start.length)})),h=null,i=null}var h,i,j=a.util.VK,k=!1,l=[{regExp:/^[*-]\s/,cmd:"InsertUnorderedList"},{regExp:/^1[.)]\s/,cmd:"InsertOrderedList"}],m=[{start:"##",format:"h2"},{start:"###",format:"h3"},{start:"####",format:"h4"},{start:"#####",format:"h5"},{start:"######",format:"h6"},{start:">",format:"blockquote"}];c.on("selectionchange",function(){k=!1}),c.on("keydown",function(a){!k||a.keyCode!==j.BACKSPACE&&27!==a.keyCode||(c.undoManager.undo(),a.preventDefault()),a.keyCode!==j.ENTER||j.modifierPressed(a)||f()},!0),c.on("keyup",function(a){j.modifierPressed(a)||(a.keyCode===j.SPACEBAR?e():a.keyCode===j.ENTER&&g())})})}(window.tinymce,window.setTimeout);
+!function(a,b){a.PluginManager.add("wptextpattern",function(c){function d(a){var b,d=c.dom.getParent(a,"p");if(d){for(;(b=d.firstChild)&&3!==b.nodeType;)d=b;if(b)return b.data||(b=b.nextSibling),b}}function e(){var e,f,g=c.selection.getRng(),i=g.startContainer;i&&d(i)===i&&(e=i.parentNode,f=i.data,a.each(l,function(a){var d=f.match(a.regExp);if(d&&g.startOffset===d[0].length)return c.undoManager.add(),c.undoManager.transact(function(){i.deleteData(0,d[0].length),e.innerHTML||e.appendChild(document.createElement("br")),c.selection.setCursorLocation(e),c.execCommand(a.cmd)}),b(function(){h="space"}),!1}))}function f(){var b,e,f=c.selection,g=f.getRng(),h=g.startOffset,k=g.startContainer,l=d(k),n=m.length;if(l){for(b=l.data;n--;)if(0===b.indexOf(m[n].start)){e=m[n];break}if(e){if(l===k){if(a.trim(b)===e.start)return;h=Math.max(0,h-e.start.length)}i=l,j=e}}}function g(){i&&(c.undoManager.add(),c.undoManager.transact(function(){c.formatter.apply(j.format,{},i),i.deleteData(0,j.start.length)}),b(function(){h="enter"})),i=null,j=null}var h,i,j,k=a.util.VK,l=[{regExp:/^[*-]\s/,cmd:"InsertUnorderedList"},{regExp:/^1[.)]\s/,cmd:"InsertOrderedList"}],m=[{start:"##",format:"h2"},{start:"###",format:"h3"},{start:"####",format:"h4"},{start:"#####",format:"h5"},{start:"######",format:"h6"},{start:">",format:"blockquote"}];c.on("selectionchange",function(){h=null}),c.on("keydown",function(a){(h&&27===a.keyCode||"space"===h&&a.keyCode===k.BACKSPACE)&&(c.undoManager.undo(),a.preventDefault()),a.keyCode!==k.ENTER||k.modifierPressed(a)||f()},!0),c.on("keyup",function(a){k.modifierPressed(a)||(a.keyCode===k.SPACEBAR?e():a.keyCode===k.ENTER&&g())})})}(window.tinymce,window.setTimeout);

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta4-33507';
+$wp_version = '4.3-beta4-33508';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.