sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve keyboard control of Edit Selection mode in the media manager.

Browse Source 
See #29326
Props adamsilverstein


git-svn-id: https://develop.svn.wordpress.org/trunk@30374 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn 2014-11-18 03:33:11 +00:00
parent 9dc0f03b9a
commit 92ae13f0ee
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wp-includes/css/media-views.css
View File

@ -925,7 +925,7 @@
} }
.attachment .close { .attachment .close {
display: none; display: block;
position: absolute; position: absolute;
top: 5px; top: 5px;
right: 5px; right: 5px;
@ -944,15 +944,16 @@
border-radius: 3px; border-radius: 3px;
-webkit-box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.3 ); -webkit-box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.3 );
box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.3 ); box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.3 );
transition-duration: none;
transition-property: none;
} }
.attachment .close:hover { .attachment a.close:hover,
.attachment a.close:focus {
-webkit-box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.6 ); -webkit-box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.6 );
box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.6 ); box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.6 );
} background-position: -36px 4px;
.attachment:hover .close {
display: block;
} }
.attachment .check { .attachment .check {

16
src/wp-includes/js/media-views.js
View File

@ -3016,6 +3016,9 @@
// Browse our library of attachments. // Browse our library of attachments.
this.content.set( view ); this.content.set( view );
// Trigger the controller to set focus
view.controller.trigger( 'edit:selection', this );
}, },
editImageContent: function() { editImageContent: function() {
@ -5096,6 +5099,7 @@
'click .close': 'removeFromLibrary', 'click .close': 'removeFromLibrary',
'click .check': 'checkClickHandler', 'click .check': 'checkClickHandler',
'click a': 'preventDefault', 'click a': 'preventDefault',
'keydown .close': 'removeFromLibrary',
'keydown': 'toggleSelectionHandler' 'keydown': 'toggleSelectionHandler'
}, },
@ -5537,6 +5541,11 @@
* @param {Object} event * @param {Object} event
*/ */
removeFromLibrary: function( event ) { removeFromLibrary: function( event ) {
// Catch enter and space events
if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {
return;
}
// Stop propagation so the model isn't selected. // Stop propagation so the model isn't selected.
event.stopPropagation(); event.stopPropagation();
@ -6236,7 +6245,7 @@
}); });
this.listenTo( this.controller, 'toggle:upload:attachment', _.bind( this.toggleUploader, this ) ); this.listenTo( this.controller, 'toggle:upload:attachment', _.bind( this.toggleUploader, this ) );
this.controller.on( 'edit:selection', this.editSelection );
this.createToolbar(); this.createToolbar();
if ( this.options.sidebar ) { if ( this.options.sidebar ) {
this.createSidebar(); this.createSidebar();
@ -6255,6 +6264,11 @@
this.collection.on( 'add remove reset', this.updateContent, this ); this.collection.on( 'add remove reset', this.updateContent, this );
}, },
editSelection: function( modal ) {
modal.$el.find( '.media-button-backToLibrary' ).focus();
},
/** /**
* @returns {wp.media.view.AttachmentsBrowser} Returns itself to allow chaining * @returns {wp.media.view.AttachmentsBrowser} Returns itself to allow chaining
*/ */