X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/c81aba3d563f7459dc79140e4c5be67bcf506b92..d3947bc013df7edd54b46deed8230d2eeafc5ecb:/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js

diff --git a/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js b/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js
index 6c894237..d68904af 100644
--- a/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js
+++ b/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js
@@ -11,21 +11,42 @@
  * using the undo shortcut, or the undo button in the toolbar.
  */
 ( function( tinymce, setTimeout ) {
+	if ( tinymce.Env.ie && tinymce.Env.ie < 9 ) {
+		return;
+	}
+
 	tinymce.PluginManager.add( 'wptextpattern', function( editor ) {
-		var VK = tinymce.util.VK,
-			spacePatterns = [
-				{ regExp: /^[*-]\s/, cmd: 'InsertUnorderedList' },
-				{ regExp: /^1[.)]\s/, cmd: 'InsertOrderedList' }
-			],
-			enterPatterns = [
-				{ start: '##', format: 'h2' },
-				{ start: '###', format: 'h3' },
-				{ start: '####', format: 'h4' },
-				{ start: '#####', format: 'h5' },
-				{ start: '######', format: 'h6' },
-				{ start: '>', format: 'blockquote' }
-			],
-			canUndo, refNode, refPattern;
+		var VK = tinymce.util.VK;
+
+		var spacePatterns = [
+			{ regExp: /^[*-]\s/, cmd: 'InsertUnorderedList' },
+			{ regExp: /^1[.)]\s/, cmd: 'InsertOrderedList' }
+		];
+
+		var enterPatterns = [
+			{ start: '##', format: 'h2' },
+			{ start: '###', format: 'h3' },
+			{ start: '####', format: 'h4' },
+			{ start: '#####', format: 'h5' },
+			{ start: '######', format: 'h6' },
+			{ start: '>', format: 'blockquote' },
+			{ regExp: /^(-){3,}$/, element: 'hr' }
+		];
+
+		var inlinePatterns = [
+			{ start: '`', end: '`', format: 'code' }
+		];
+
+		var canUndo;
+		var chars = [];
+
+		tinymce.each( inlinePatterns, function( pattern ) {
+			tinymce.each( ( pattern.start + pattern.end ).split( '' ), function( c ) {
+				if ( tinymce.inArray( chars, c ) === -1 ) {
+					chars.push( c );
+				}
+			} );
+		} );
 
 		editor.on( 'selectionchange', function() {
 			canUndo = null;
@@ -39,18 +60,103 @@
 			}
 
 			if ( event.keyCode === VK.ENTER && ! VK.modifierPressed( event ) ) {
-				watchEnter();
+				enter();
 			}
 		}, true );
 
 		editor.on( 'keyup', function( event ) {
 			if ( event.keyCode === VK.SPACEBAR && ! event.ctrlKey && ! event.metaKey && ! event.altKey ) {
 				space();
-			} else if ( event.keyCode === VK.ENTER && ! VK.modifierPressed( event ) ) {
-				enter();
+			} else if ( event.keyCode > 47 && ! ( event.keyCode >= 91 && event.keyCode <= 93 ) ) {
+				inline();
 			}
 		} );
 
+		function inline() {
+			var rng = editor.selection.getRng();
+			var node = rng.startContainer;
+			var offset = rng.startOffset;
+			var startOffset;
+			var endOffset;
+			var pattern;
+			var format;
+			var zero;
+
+			if ( ! node || node.nodeType !== 3 || ! node.data.length || ! offset ) {
+				return;
+			}
+
+			if ( tinymce.inArray( chars, node.data.charAt( offset - 1 ) ) === -1 ) {
+				return;
+			}
+
+			function findStart( node ) {
+				var i = inlinePatterns.length;
+				var offset;
+
+				while ( i-- ) {
+					pattern = inlinePatterns[ i ];
+					offset = node.data.indexOf( pattern.end );
+
+					if ( offset !== -1 ) {
+						return offset;
+					}
+				}
+			}
+
+			startOffset = findStart( node );
+			endOffset = node.data.lastIndexOf( pattern.end );
+
+			if ( startOffset === endOffset || endOffset === -1 ) {
+				return;
+			}
+
+			if ( endOffset - startOffset <= pattern.start.length ) {
+				return;
+			}
+
+			if ( node.data.slice( startOffset + pattern.start.length, endOffset ).indexOf( pattern.start.slice( 0, 1 ) ) !== -1 ) {
+				return;
+			}
+
+			format = editor.formatter.get( pattern.format );
+
+			if ( format && format[0].inline ) {
+				editor.undoManager.add();
+
+				editor.undoManager.transact( function() {
+					node.insertData( offset, '\u200b' );
+
+					node = node.splitText( startOffset );
+					zero = node.splitText( offset - startOffset );
+
+					node.deleteData( 0, pattern.start.length );
+					node.deleteData( node.data.length - pattern.end.length, pattern.end.length );
+
+					editor.formatter.apply( pattern.format, {}, node );
+
+					editor.selection.setCursorLocation( zero, 1 );
+				} );
+
+				// We need to wait for native events to be triggered.
+				setTimeout( function() {
+					canUndo = 'space';
+
+					editor.once( 'selectionchange', function() {
+						var offset;
+
+						if ( zero ) {
+							offset = zero.data.indexOf( '\u200b' );
+
+							if ( offset !== -1 ) {
+								zero.deleteData( offset, offset + 1 );
+							}
+						}
+					} );
+				} );
+			}
+		}
+
 		function firstTextNode( node ) {
 			var parent = editor.dom.getParent( node, 'p' ),
 				child;
@@ -124,12 +230,12 @@
 			} );
 		}
 
-		function watchEnter() {
+		function enter() {
 			var rng = editor.selection.getRng(),
 				start = rng.startContainer,
 				node = firstTextNode( start ),
 				i = enterPatterns.length,
-				text, pattern;
+				text, pattern, parent;
 
 			if ( ! node ) {
 				return;
@@ -138,10 +244,17 @@
 			text = node.data;
 
 			while ( i-- ) {
-				 if ( text.indexOf( enterPatterns[ i ].start ) === 0 ) {
-				 	pattern = enterPatterns[ i ];
-				 	break;
-				 }
+				if ( enterPatterns[ i ].start ) {
+					if ( text.indexOf( enterPatterns[ i ].start ) === 0 ) {
+						pattern = enterPatterns[ i ];
+						break;
+					}
+				} else if ( enterPatterns[ i ].regExp ) {
+					if ( enterPatterns[ i ].regExp.test( text ) ) {
+						pattern = enterPatterns[ i ];
+						break;
+					}
+				}
 			}
 
 			if ( ! pattern ) {
@@ -152,27 +265,31 @@
 				return;
 			}
 
-			refNode = node;
-			refPattern = pattern;
-		}
-
-		function enter() {
-			if ( refNode ) {
+			editor.once( 'keyup', function() {
 				editor.undoManager.add();
 
 				editor.undoManager.transact( function() {
-					editor.formatter.apply( refPattern.format, {}, refNode );
-					refNode.replaceData( 0, refNode.data.length, tinymce.trim( refNode.data.slice( refPattern.start.length ) ) );
+					if ( pattern.format ) {
+						editor.formatter.apply( pattern.format, {}, node );
+						node.replaceData( 0, node.data.length, ltrim( node.data.slice( pattern.start.length ) ) );
+					} else if ( pattern.element ) {
+						parent = node.parentNode && node.parentNode.parentNode;
+
+						if ( parent ) {
+							parent.replaceChild( document.createElement( pattern.element ), node.parentNode );
+						}
+					}
 				} );
 
 				// We need to wait for native events to be triggered.
 				setTimeout( function() {
 					canUndo = 'enter';
 				} );
-			}
+			} );
+		}
 
-			refNode = null;
-			refPattern = null;
+		function ltrim( text ) {
+			return text ? text.replace( /^\s+/, '' ) : '';
 		}
 	} );
 } )( window.tinymce, window.setTimeout );