From be096cf4a5fdffcacefb797f14c17ced6898929c Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Fri, 30 Nov 2012 08:37:17 +0000 Subject: [PATCH] Pressing escape now closes the media modal. props koopersmith, see #22502. git-svn-id: https://develop.svn.wordpress.org/trunk@22946 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/js/media-views.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/wp-includes/js/media-views.js b/wp-includes/js/media-views.js index 19e230aae3..a3af9a210a 100644 --- a/wp-includes/js/media-views.js +++ b/wp-includes/js/media-views.js @@ -1616,8 +1616,13 @@ tagName: 'div', template: media.template('media-modal'), + attributes: { + tabindex: 0 + }, + events: { - 'click .media-modal-backdrop, .media-modal-close' : 'closeHandler' + 'click .media-modal-backdrop, .media-modal-close': 'closeHandler', + 'keydown': 'keydown' }, initialize: function() { @@ -1658,7 +1663,7 @@ }, open: function() { - this.$el.show(); + this.$el.show().focus(); return this.propagate('open'); }, @@ -1691,6 +1696,15 @@ this.controller.trigger( id ); return this; + }, + + keydown: function( event ) { + // Close the modal when escape is pressed. + if ( 27 === event.which ) { + event.preventDefault(); + this.close(); + return; + } } });