Make WordPress Core

Changeset 39077


Ignore:
Timestamp:
11/01/2016 08:33:21 PM (8 years ago)
Author:
iseulde
Message:

TinyMCE: wptextpattern: Fix undo shortcut for inline patterns

Fixes #37092.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js

    r39075 r39077  
    7272            }
    7373
    74             if ( event.keyCode === VK.ENTER && ! VK.modifierPressed( event ) ) {
     74            if ( VK.metaKeyPressed( event ) ) {
     75                return;
     76            }
     77
     78            if ( event.keyCode === VK.ENTER ) {
    7579                enter();
    76             }
    77 
    7880            // Wait for the browser to insert the character.
    79             if ( event.keyCode === VK.SPACEBAR && ! event.ctrlKey && ! event.metaKey && ! event.altKey ) {
     81            } else if ( event.keyCode === VK.SPACEBAR ) {
    8082                setTimeout( space );
    8183            } else if ( event.keyCode > 47 && ! ( event.keyCode >= 91 && event.keyCode <= 93 ) ) {
Note: See TracChangeset for help on using the changeset viewer.