From d48bee596a90f9d3a3cb7f6675bea07ef53b9662 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Wed, 13 Aug 2014 18:14:15 +0000 Subject: [PATCH] In the Edit Attachment frame, when in Edit Image mode, add a key event for Escape. There are conflicting `keydown` handlers that don't propagate the event to the modal properly. Fixes #29121. git-svn-id: https://develop.svn.wordpress.org/trunk@29481 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/media-grid.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/js/media-grid.js b/src/wp-includes/js/media-grid.js index bf864fe90c..91ebab12a3 100644 --- a/src/wp-includes/js/media-grid.js +++ b/src/wp-includes/js/media-grid.js @@ -492,12 +492,18 @@ if ( $target.is( 'input' ) || $target.is( 'textarea' ) ) { return event; } + + // Escape key, while in the Edit Image mode + if ( 27 === event.keyCode ) { + this.modal.close(); + } + // The right arrow key - if ( event.keyCode === 39 ) { + if ( 39 === event.keyCode ) { this.nextMediaItem(); } // The left arrow key - if ( event.keyCode === 37 ) { + if ( 37 === event.keyCode ) { this.previousMediaItem(); } },