Ticket #33300: 33300.3.patch

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

@@ -25 +25 @@
                         { start: '####', format: 'h4' },
                         { start: '#####', format: 'h5' },
                         { start: '######', format: 'h6' },
-                        { start: '>', format: 'blockquote' }
+                        { start: '>', format: 'blockquote' },
+                        { regExp: /^(?:[*-]\s?){3,}$/, element: 'hr' }
                 ];
 
                 var inlinePatterns = [
@@ -37 +38 @@
                 ];
 
                 var canUndo;
-                var refNode;
-                var refPattern;
                 var chars = [];
                 var zeroWidthSpaceNode;
 
@@ -72 +71 @@
                         }
 
                         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();
                         }
@@ -233 +230 @@
                         } );
                 }
 
-                function watchEnter() {
+                function enter() {
                         var rng = editor.selection.getRng(),
                                 start = rng.startContainer,
                                 node = firstTextNode( start ),
@@ -247 +244 @@
                         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 ) {
@@ -261 +265 @@
                                 return;
                         }
 
-                        refNode = node;
-                        refPattern = pattern;
-                }
-
-                function ltrim( text ) {
-                        return text ? text.replace( /^\s+/, '' ) : '';
-                }
-
-                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, ltrim( 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 ) {
+                                                editor.getBody().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 );