Ticket #36585: 36585.2.diff

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

@@ -6 +6 @@
                 return;
         }
 
-        function mceType(chr) {
-                var editor = tinymce.activeEditor, keyCode, charCode, evt, startElm, rng, startContainer, startOffset, textNode;
+        function mceType( chr, eventType ) {
+                var editor = tinymce.activeEditor,
+                        doKeyDown  = ! eventType || /\bkeydown\b/.test( eventType ),
+                        doKeyPress = ! eventType || /\bkeypress\b/.test( eventType ),
+                        doKeyUp    = ! eventType || /\bkeyup\b/.test( eventType ),
+                        keyCode, charCode, evt,
+                        startElm, rng, startContainer, startOffset,
+                        textNode;
 
                 function charCodeToKeyCode(charCode) {
                         var lookup = {
@@ -56 +62 @@
                 evt = evt || {keyCode: keyCode, charCode: charCode};
 
                 startElm = editor.selection.getStart();
-                fakeEvent(startElm, 'keydown', evt);
-                fakeEvent(startElm, 'keypress', evt);
+                if ( doKeyDown ) {
+                        fakeEvent(startElm, 'keydown', evt);
+                }
+                if ( doKeyPress ) {
+                        fakeEvent(startElm, 'keypress', evt);
+                }
 
-                if (!evt.isDefaultPrevented()) {
+                if ( ( doKeyDown || doKeyPress ) && ! evt.isDefaultPrevented() ) {
                         if (keyCode === 8) {
                                 if (editor.getDoc().selection) {
                                         rng = editor.getDoc().selection.createRange();
@@ -109 +119 @@
                         }
                 }
 
-                fakeEvent(startElm, 'keyup', evt);
+                if ( doKeyUp ) {
+                        fakeEvent( startElm, 'keyup', evt );
+                }
         }
 
         function type() {
@@ -219 +231 @@
                 }, assert.async() );
         } );
 
-        QUnit.test( 'Only transform when at the cursor is at the start.', function( assert ) {
+        QUnit.test( 'Only transform when the cursor is at the start.', function( assert ) {
                 editor.setContent( '<p>* test</p>' );
                 editor.selection.setCursorLocation( editor.$( 'p' )[0].firstChild, 6 );
 
@@ -228 +240 @@
                 }, assert.async() );
         } );
 
+        QUnit.test( 'Transform when space pressed along with another key. (1)', function( assert ) {
+                var done = assert.async();
+
+                editor.setContent( '<p>*' );
+                editor.selection.setCursorLocation( editor.$( 'p' )[0].firstChild, 1 );
+
+                mceType( ' ', 'keydown,keypress' );
+                mceType( 'a', 'keydown,keypress' );
+                mceType( ' ', 'keyup' );
+                mceType( 'a', 'keyup' );
+
+                setTimeout( function() {
+                        assert.equal( editor.getContent(), '<ul>\n<li>a</li>\n</ul>' );
+                        assert.equal( editor.selection.getRng().startOffset, 1 );
+                        done();
+                } );
+        } );
+
+        QUnit.test( 'Transform when space pressed along with another key. (2)', function( assert ) {
+                var done = assert.async();
+
+                editor.setContent( '<p>*' );
+                editor.selection.setCursorLocation( editor.$( 'p' )[0].firstChild, 1 );
+
+                mceType( ' ', 'keydown,keypress' );
+                mceType( '0', 'keydown,keypress' );
+                mceType( '0', 'keyup' );
+                mceType( ' ', 'keyup' );
+
+                setTimeout( function() {
+                        assert.equal( editor.getContent(), '<ul>\n<li>0</li>\n</ul>' );
+                        assert.equal( editor.selection.getRng().startOffset, 1 );
+                        done();
+                } );
+        } );
+
+        QUnit.test( 'Transform when space pressed along with another key, then backspace to undo.', function( assert ) {
+                editor.setContent( '<p>*' );
+                editor.selection.setCursorLocation( editor.$( 'p' )[0].firstChild, 1 );
+
+                mceType( ' ', 'keydown,keypress' );
+                mceType( 'a', 'keydown,keypress' );
+                mceType( ' ', 'keyup' );
+                mceType( 'a', 'keyup' );
+
+                type( '\b', function() {
+                        assert.equal( editor.getContent(), '<p>* a</p>' );
+                        assert.equal( editor.selection.getRng().startOffset, 3 );
+                }, assert.async() );
+        } );
+
         QUnit.test( 'Backspace should undo the transformation.', function( assert ) {
                 editor.setContent( '<p>test</p>' );
                 editor.selection.setCursorLocation();

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

@@ -39 +39 @@
 
                 var canUndo;
                 var chars = [];
+                var isSpacePressed = false;
+                var keysPressedWithSpace = [];
 
                 tinymce.each( inlinePatterns, function( pattern ) {
                         tinymce.each( ( pattern.start + pattern.end ).split( '' ), function( c ) {
@@ -62 +64 @@
                         if ( event.keyCode === VK.ENTER && ! VK.modifierPressed( event ) ) {
                                 enter();
                         }
+
+                        if ( event.keyCode === VK.SPACEBAR && ! event.ctrlKey && ! event.metaKey && ! event.altKey ) {
+                                isSpacePressed = true;
+                        } else if ( isSpacePressed && event.keyCode > 32 && event.keyCode < 127 ) {
+                                keysPressedWithSpace.push( event.keyCode );
+                        }
                 }, true );
 
                 editor.on( 'keyup', function( event ) {
                         if ( event.keyCode === VK.SPACEBAR && ! event.ctrlKey && ! event.metaKey && ! event.altKey ) {
                                 space();
+                                isSpacePressed = false;
+                                keysPressedWithSpace = [];
                         } else if ( event.keyCode > 47 && ! ( event.keyCode >= 91 && event.keyCode <= 93 ) ) {
                                 inline();
                         }
@@ -204 +214 @@
                         tinymce.each( spacePatterns, function( pattern ) {
                                 var match = text.match( pattern.regExp );
 
-                                if ( ! match || rng.startOffset !== match[0].length ) {
+                                if ( ! match || rng.startOffset !== match[0].length + keysPressedWithSpace.length ) {
                                         return;
                                 }
 
@@ -217 +227 @@
                                                 parent.appendChild( document.createElement( 'br' ) );
                                         }
 
-                                        editor.selection.setCursorLocation( parent );
+                                        if ( keysPressedWithSpace.length === 0 ) {
+                                                editor.selection.setCursorLocation( parent );
+                                        }
                                         editor.execCommand( pattern.cmd );
                                 } );