Media: Add filters to the media library. fixes #22514, see #21390.

git-svn-id: http://core.svn.wordpress.org/trunk@22712 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Daryl Koopersmith 2012-11-20 13:49:35 +00:00
parent 7f377032aa
commit 6fb316b1fb
3 changed files with 104 additions and 10 deletions

View File

@ -388,6 +388,14 @@
width: 100%;
}
/**
* Attachment Browser Filters
*/
.media-frame select.attachment-filters {
margin-top: 11px;
margin-right: 10px;
}
/**
* Search
*/

View File

@ -255,7 +255,8 @@
describe: false,
toolbar: 'main-attachments',
sidebar: 'settings',
searchable: true
searchable: true,
filterable: false
},
initialize: function() {
@ -334,7 +335,6 @@
content: function() {
var frame = this.frame;
// Content.
if ( this.get('empty') ) {
// Attempt to fetch any Attachments we don't already have.
this.get('library').more();
@ -354,7 +354,13 @@
},
_updateEmpty: function() {
var library = this.get('library');
var library = this.get('library'),
props = library.props;
// If we're filtering the library, bail.
if ( this.get('filterable') && ( props.get('type') || props.get('parent') ) )
return;
this.set( 'empty', ! library.length && ! library.props.get('search') );
},
@ -1213,6 +1219,7 @@
sortable: state.get('sortable'),
search: state.get('searchable'),
upload: state.get('upload'),
filters: state.get('filterable'),
AttachmentView: state.get('AttachmentView')
}) );
@ -1342,7 +1349,8 @@
new media.controller.Library( _.defaults({
selection: options.selection,
library: media.query( options.library ),
editable: true
editable: true,
filterable: true
}, main ) ),
new media.controller.Upload( main ),
@ -2719,6 +2727,70 @@
}
});
/**
* wp.media.view.AttachmentFilters
*/
media.view.AttachmentFilters = media.View.extend({
tagName: 'select',
className: 'attachment-filters',
events: {
change: 'change'
},
initialize: function() {
var els;
els = _.map({
all: 'allMediaItems',
uploaded: 'uploadedToThisPost',
image: 'images',
audio: 'audio',
video: 'videos'
}, function( text, value ) {
return this.make( 'option', { value: value }, l10n[ text ] );
}, this );
this.$el.html( els );
this.model.on( 'change', this.select, this );
this.select();
},
change: function( event ) {
var model = this.model,
value = this.el.value,
type;
if ( 'all' === value || 'uploaded' === value )
model.unset('type');
else if ( 'image' === value || 'audio' === value || 'video' === value )
model.set( 'type', value );
if ( 'uploaded' === value )
model.set( 'parent', media.view.settings.postId );
else
model.unset('parent');
},
select: function() {
var model = this.model,
type = model.get('type'),
value = 'all';
if ( model.get('parent') === media.view.settings.postId )
value = 'uploaded';
else if ( 'image' === type )
value = 'image';
else if ( 'audio' === type )
value = 'audio';
else if ( 'video' === type )
value = 'video';
this.$el.val( value );
}
});
/**
@ -2732,9 +2804,9 @@
this.controller = this.options.controller;
_.defaults( this.options, {
filters: false,
search: true,
upload: false,
total: true,
AttachmentView: media.view.Attachment.Library
});
@ -2743,11 +2815,19 @@
controller: this.controller
});
if ( this.options.filters ) {
this.toolbar.set( 'filters', new media.view.AttachmentFilters({
controller: this.controller,
model: this.collection.props,
priority: -80
}).render() );
}
if ( this.options.search ) {
this.toolbar.set( 'search', new media.view.Search({
controller: this.controller,
model: this.collection.props,
priority: -60
priority: 60
}).render() );
}

View File

@ -1357,6 +1357,12 @@ function wp_enqueue_media( $args = array() ) {
'insertIntoPost' => __( 'Insert into post' ),
'returnToLibrary' => __( '← Return to library' ),
'allMediaItems' => __( 'All media items' ),
'uploadedToThisPost' => __( 'Uploaded to this post' ),
'images' => __( 'Images' ),
'audio' => __( 'Audio' ),
'videos' => __( 'Videos' ),
// Embed
'embedFromUrlTitle' => __( 'Embed From URL' ),
'insertEmbed' => __( 'Insert embed' ),