Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

Initial cleanup after [29220]:

Browse Source 
* Alter/remove some jQuery global selectors, views should only manage themselves
* Trigger an event for attachments when arrow keys are pressed: `attachment:keydown:arrow`
* `media.view.Attachments` should listen for `attachment:keydown:arrow`
* Favor scoped selectors over globals

See #23560.

Built from https://develop.svn.wordpress.org/trunk@29555


git-svn-id: http://core.svn.wordpress.org/trunk@29330 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-08-20 19:14:15 +00:00
parent dc4d08e032
commit 31bb46d0fc
2 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
wp-includes/js/media-views.js
View File

@ -4854,49 +4854,8 @@
* @param {Object} event
*/
arrowEvent: function( event ) {
var attachment = $('.attachments-browser .attachment'),
attachmentsWidth = $('.attachments-browser .attachments').width(),
thumbnailWidth = attachment.first().outerWidth(),
thumbnailsPerRow = Math.round( attachmentsWidth / thumbnailWidth ),
totalThumnails = attachment.length,
totalRows = Math.ceil(totalThumnails/thumbnailsPerRow),
thisIndex = attachment.filter( ':focus' ).index(),
thisIndexAdjusted = thisIndex + 1,
thisRow = thisIndexAdjusted <= thumbnailsPerRow ? 1 : Math.ceil(thisIndexAdjusted/thumbnailsPerRow);
// Left arrow
if ( 37 === event.keyCode ) {
if ( 0 === thisIndex ) {
return;
}
attachment.eq( thisIndex - 1 ).focus();
}
// Up arrow
if ( 38 === event.keyCode ) {
if ( 1 === thisRow ) {
return;
}
attachment.eq( thisIndex - thumbnailsPerRow ).focus();
}
// Right arrow
if ( 39 === event.keyCode ) {
if ( totalThumnails === thisIndex ) {
return;
}
attachment.eq( thisIndex + 1 ).focus();
}
// Down arrow
if ( 40 === event.keyCode ) {
if ( totalRows === thisRow ) {
return;
}
attachment.eq( thisIndex + thumbnailsPerRow ).focus();
}
return false;
this.controller.trigger( 'attachment:keydown:arrow', event );
return false;
},
/**
* @param {Object} options
@ -5315,6 +5274,8 @@
this.collection.on( 'reset', this.render, this );
this.listenTo( this.controller, 'attachment:keydown:arrow', this.arrowEvent );
// Throttle the scroll handler and bind this.
this.scroll = _.chain( this.scroll ).bind( this ).throttle( this.options.refreshSensitivity ).value();
@ -5335,6 +5296,45 @@
_.defer( this.setColumns, this );
},
arrowEvent: function( event ) {
var attachments = this.$el.children( 'li' ),
perRow = Math.round( this.$el.width() / attachments.first().outerWidth() ),
index = attachments.filter( ':focus' ).index(),
row = ( index + 1 ) <= perRow ? 1 : Math.ceil( ( index + 1 ) / perRow );
// Left arrow
if ( 37 === event.keyCode ) {
if ( 0 === index ) {
return;
}
attachments.eq( index - 1 ).focus();
}
// Up arrow
if ( 38 === event.keyCode ) {
if ( 1 === row ) {
return;
}
attachments.eq( index - perRow ).focus();
}
// Right arrow
if ( 39 === event.keyCode ) {
if ( attachments.length === index ) {
return;
}
attachments.eq( index + 1 ).focus();
}
// Down arrow
if ( 40 === event.keyCode ) {
if ( Math.ceil( attachments.length / perRow ) === row ) {
return;
}
attachments.eq( index + perRow ).focus();
}
},
dispose: function() {
this.collection.props.off( null, null, this );
$( window ).off( 'resize.media-modal-columns' );
@ -6581,12 +6581,11 @@
* @param {Object} event
*/
toggleSelectionHandler: function( event ) {
if ( 'keydown' === event.type && 9 === event.keyCode && event.shiftKey && event.target === $( ':tabbable', this.$el ).filter( ':first' )[0] ) {
$('.attachments-browser .details').focus();
if ( 'keydown' === event.type && 9 === event.keyCode && event.shiftKey && event.target === this.$( ':tabbable' ).get( 0 ) ) {
this.$( ':tabbable' ).eq( 0 ).blur();
return false;
}
}
});
/**

4
wp-includes/js/media-views.min.js vendored
View File

File diff suppressed because one or more lines are too long