Changeset 37668

Timestamp:

06/09/2016 07:06:25 PM (8 years ago)

Author:

iseulde

Message:

TinyMCE: wptextpattern: fix for fast typing

Props jnylen0, iseulde.

Fixes #36585.

Location:

trunk

Files:

• src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js (modified) (1 diff)
• tests/qunit/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js (modified) (5 diffs)

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

@@ -63 +63 @@
                 enter();
             }
+
+            // Wait for the browser to insert the character.
+            if ( event.keyCode === VK.SPACEBAR && ! event.ctrlKey && ! event.metaKey && ! event.altKey ) {
+                setTimeout( space );
+            } else if ( event.keyCode > 47 && ! ( event.keyCode >= 91 && event.keyCode <= 93 ) ) {
+                setTimeout( inline );
+            }
         }, true );
-
-        editor.on( 'keyup', function( event ) {
-            if ( event.keyCode === VK.SPACEBAR && ! event.ctrlKey && ! event.metaKey && ! event.altKey ) {
-                space();
-            } else if ( event.keyCode > 47 && ! ( event.keyCode >= 91 && event.keyCode <= 93 ) ) {
-                inline();
-            }
-        } );
 
         function inline() {

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

@@ -7 +7 @@
     }
 
-    function mceType(chr) {
+    function mceType( chr, noKeyUp ) {
         var editor = tinymce.activeEditor, keyCode, charCode, evt, startElm, rng, startContainer, startOffset, textNode;
 
@@ -110 +110 @@
         }
 
-        fakeEvent(startElm, 'keyup', evt);
+        if ( ! noKeyUp ) {
+            fakeEvent(startElm, 'keyup', evt);
+        }
     }
 
@@ -116 +118 @@
         var args = arguments;
 
+        // Wait once for conversions to be triggered,
+        // and once for the `canUndo` flag to be set.
+        setTimeout( function() {
         setTimeout( function() {
             if ( typeof args[0] === 'string' ) {
@@ -134 +139 @@
                 type.apply( null, args );
             }
+        } );
         } );
     }
@@ -178 +184 @@
     } );
 
+    QUnit.test( 'Unordered list. (fast)', function( assert ) {
+        type( '*', function() {
+            mceType( ' ', true );
+        }, 'a', function() {
+            assert.equal( editor.getContent(), '<ul>\n<li>a</li>\n</ul>' );
+        }, assert.async() );
+    } );
+
     QUnit.test( 'Ordered list.', function( assert ) {
         type( '1. a', function() {