← Back to branch summary

~canonical-sysadmins/wordpress/4.7.2

« back to all changes in this revision

Viewing changes to wp-includes/js/tinymce/plugins/wptextpattern/plugin.js

  • Committer: Barry Price
  • Date: 2016-08-17 04:50:12 UTC
  • mfrom: (1.1.18 upstream)
  • Revision ID: barry.price@canonical.com-20160817045012-qfui81zhqnqv2ba9
Merge WP4.6 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/js/tinymce/plugins/wptextpattern/plugin.js
62
62
                        if ( event.keyCode === VK.ENTER && ! VK.modifierPressed( event ) ) {
63
63
                                enter();
64
64
                        }
65
 
                }, true );
66
65
 
67
 
                editor.on( 'keyup', function( event ) {
 
66
                        // Wait for the browser to insert the character.
68
67
                        if ( event.keyCode === VK.SPACEBAR && ! event.ctrlKey && ! event.metaKey && ! event.altKey ) {
69
 
                                space();
 
68
                                setTimeout( space );
70
69
                        } else if ( event.keyCode > 47 && ! ( event.keyCode >= 91 && event.keyCode <= 93 ) ) {
71
 
                                inline();
 
70
                                setTimeout( inline );
72
71
                        }
73
 
                } );
 
72
                }, true );
74
73
 
75
74
                function inline() {
76
75
                        var rng = editor.selection.getRng();