WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Media: Automatically strip any non-image items from the collection when creating a gallery. 

Also changes the rules for when the "new gallery" button shows:
* More than two items must be selected.
* At least one of them must be an image.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22535 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Daryl Koopersmith 2012-11-10 19:25:39 +00:00
parent 04b85c399d
commit 43c289dee6
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1597,13 +1597,14 @@
// --------------------------------- // ---------------------------------
media.view.Toolbar.Insert.Post = media.view.Toolbar.Insert.extend({ media.view.Toolbar.Insert.Post = media.view.Toolbar.Insert.extend({
initialize: function() { initialize: function() {
var selectionToLibrary = function( state ) { var selectionToLibrary = function( state, filter ) {
return function() { return function() {
var controller = this.controller, var controller = this.controller,
selection = controller.state().get('selection'), selection = controller.state().get('selection'),
edit = controller.get( state ); edit = controller.get( state ),
models = filter ? filter( selection ) : selection.models;
edit.set( 'library', new media.model.Selection( selection.models, { edit.set( 'library', new media.model.Selection( models, {
props: selection.props.toJSON(), props: selection.props.toJSON(),
multiple: true multiple: true
}) ); }) );
@ -1616,7 +1617,9 @@
gallery: { gallery: {
text: l10n.createNewGallery, text: l10n.createNewGallery,
priority: 40, priority: 40,
click: selectionToLibrary('gallery-edit') click: selectionToLibrary('gallery-edit', function( selection ) {
return selection.where({ type: 'image' });
})
}, },
batch: { batch: {
@ -1637,7 +1640,7 @@
media.view.Toolbar.Insert.prototype.refresh.apply( this, arguments ); media.view.Toolbar.Insert.prototype.refresh.apply( this, arguments );
// Check if every attachment in the selection is an image. // Check if every attachment in the selection is an image.
this.get('gallery').$el.toggle( count > 1 && selection.all( function( attachment ) { this.get('gallery').$el.toggle( count > 1 && selection.any( function( attachment ) {
return 'image' === attachment.get('type'); return 'image' === attachment.get('type');
}) ); }) );