Ticket #36459: 36459.patch

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

@@ -41 +41 @@
                 var chars = [];
 
                 tinymce.each( inlinePatterns, function( pattern ) {
-                        tinymce.each( ( pattern.start + pattern.end ).split( '' ), function( c ) {
+                        tinymce.each( ( pattern.end ).split( '' ), function( c ) {
                                 if ( tinymce.inArray( chars, c ) === -1 ) {
                                         chars.push( c );
                                 }
@@ -65 +65 @@
                 }, true );
 
                 editor.on( 'keyup', function( event ) {
+                        var did_space = false;
                         if ( event.keyCode === VK.SPACEBAR && ! event.ctrlKey && ! event.metaKey && ! event.altKey ) {
-                                space();
-                        } else if ( event.keyCode > 47 && ! ( event.keyCode >= 91 && event.keyCode <= 93 ) ) {
+                                did_space = space();
+                        }
+                        if ( ! did_space && ! ( event.keyCode >= 1 && event.keyCode <= 31 ) && ! (event.keyCode >= 91 && event.keyCode <= 93 ) ) {
                                 inline();
                         }
                 } );
@@ -87 +89 @@
                         }
 
                         if ( tinymce.inArray( chars, node.data.charAt( offset - 1 ) ) === -1 ) {
-                                return;
+                                // Allow for one character of type ahead.
+                                if ( --offset <= 1 || tinymce.inArray( chars, node.data.charAt( offset - 1 ) ) === -1 ) {
+                                        return;
+                                }
                         }
 
-                        function findStart( node ) {
+                        function findEnd( node ) {
                                 var i = inlinePatterns.length;
-                                var offset;
+                                var index;
 
                                 while ( i-- ) {
                                         pattern = inlinePatterns[ i ];
-                                        offset = node.data.indexOf( pattern.end );
+                                        index = node.data.lastIndexOf( pattern.end );
 
-                                        if ( offset !== -1 ) {
-                                                return offset;
+                                        if ( index !== -1 && index === offset - pattern.end.length ) {
+                                                return index;
                                         }
                                 }
                         }
 
-                        startOffset = findStart( node );
-                        endOffset = node.data.lastIndexOf( pattern.end );
-
-                        if ( startOffset === endOffset || endOffset === -1 ) {
+                        endOffset = findEnd( node );
+                        if ( ! endOffset ) {
                                 return;
                         }
+                        startOffset = node.data.substr( 0, endOffset ).lastIndexOf( pattern.start );
+                        if ( startOffset === -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 ) {
+                        // Ignore if in pattern node already.
+                        if ( node.parentNode.nodeName.toLowerCase() === pattern.format ) {
                                 return;
                         }
 
+                        // Ignore if a single white space or empty as node won't be created by editor.formatter.apply() below (same test as tinymce/Formatter/isWhiteSpaceNode()).
+                        if ( /^([\t \r\n]+|)$/.test( node.data.slice( startOffset + pattern.start.length, endOffset ) ) ) {
+                                return;
+                        }
+
                         format = editor.formatter.get( pattern.format );
 
                         if ( format && format[0].inline ) {
@@ -192 +205 @@
                         var rng = editor.selection.getRng(),
                                 node = rng.startContainer,
                                 parent,
-                                text;
+                                text,
+                                ret = false;
 
                         if ( ! node || firstTextNode( node ) !== node ) {
-                                return;
+                                return ret;
                         }
 
                         parent = node.parentNode;
@@ -225 +239 @@
                                 setTimeout( function() {
                                         canUndo = 'space';
                                 } );
+                                ret = true;
 
                                 return false;
                         } );
+
+                        return ret;
                 }
 
                 function enter() {