Changeset 22535

Timestamp:

11/10/2012 07:25:39 PM (12 years ago)

Author:

koopersmith

Message:

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.

File:

• trunk/wp-includes/js/media-views.js (modified) (3 diffs)

trunk/wp-includes/js/media-views.js

@@ -1598 +1598 @@
     media.view.Toolbar.Insert.Post = media.view.Toolbar.Insert.extend({
         initialize: function() {
-            var selectionToLibrary = function( state ) {
+            var selectionToLibrary = function( state, filter ) {
                     return function() {
                         var controller = this.controller,
                             selection = controller.state().get('selection'),
-                            edit = controller.get( state );
-
-                        edit.set( 'library', new media.model.Selection( selection.models, {
+                            edit = controller.get( state ),
+                            models = filter ? filter( selection ) : selection.models;
+
+                        edit.set( 'library', new media.model.Selection( models, {
                             props:    selection.props.toJSON(),
                             multiple: true
@@ -1617 +1618 @@
                     text:     l10n.createNewGallery,
                     priority: 40,
-                    click:    selectionToLibrary('gallery-edit')
+                    click:    selectionToLibrary('gallery-edit', function( selection ) {
+                        return selection.where({ type: 'image' });
+                    })
                 },
 
@@ -1638 +1641 @@
 
             // 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');
             }) );