Ticket #22502: 22502.escape.diff

wp-includes/js/media-views.js

@@ -1647 +1647 @@
                 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() {
@@ -1689 +1694 @@
                 },
 
                 open: function() {
-                        this.$el.show();
+                        this.$el.show().focus();
                         return this.propagate('open');
                 },
 
@@ -1722 +1727 @@
                                 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;
+                        }
                 }
         });