Changeset 22157

Timestamp:

10/10/2012 09:30:22 AM (12 years ago)

Author:

koopersmith

Message:

When editing a gallery, images can now be added from the media library.

Enables the "Add images from media library" button when editing. The UX has room for improvement, but it's a start.

see #21390, #21809.

Location:

trunk/wp-includes

Files:

• js/media-views.js (modified) (5 diffs)
• media.php (modified) (1 diff)
• script-loader.php (modified) (1 diff)

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

@@ -43 +43 @@
             this.add( 'library', media.view.Workspace.Library, {
                 collection: media.query( this.get('library') )
-            } );
+            });
             this.unset('library');
 
             // Add the gallery view.
-            this.add( 'gallery', media.view.Workspace.Gallery, { collection: this.selection } );
+            this.add( 'gallery', media.view.Workspace.Gallery, {
+                collection: this.selection
+            });
+            this.add( 'gallery-library', media.view.Workspace.Library.Gallery, {
+                collection: media.query({ type: 'image' })
+            });
         },
 
@@ -720 +725 @@
     });
 
+    media.view.Workspace.Library.Gallery = media.view.Workspace.Library.extend({
+        initToolbarView: function() {
+            var controller = this.controller,
+                editing = controller.get('editing'),
+                items = {
+                    'selection-preview': new media.view.SelectionPreview({
+                        controller: this.controller,
+                        collection: this.controller.selection,
+                        priority:   -40,
+                        clearable:  false
+                    }),
+
+                    'continue-editing-gallery': {
+                        style:    'primary',
+                        text:     l10n.continueEditingGallery,
+                        priority: 40,
+
+                        click: function() {
+                            controller.render( 'gallery' );
+                        }
+                    }
+                };
+
+            this.toolbarView = new media.view.Toolbar({
+                items: items
+            });
+
+            this.$el.addClass('with-toolbar');
+            this.$content.append( this.toolbarView.$el );
+        }
+    });
+
     /**
      * wp.media.view.Workspace.Gallery
@@ -751 +788 @@
                     },
 
-                    'add-images-from-library': {
-                        text:     l10n.addImagesFromLibrary,
-                        priority: 30
+                    'return-to-library': {
+                        text:     editing ? l10n.addImagesFromLibrary : l10n.returnToLibrary,
+                        priority: -40,
+
+                        click: function() {
+                            controller.render( editing ? 'gallery-library' : 'library' );
+                        }
                     }
                 };
-
-            if ( ! editing ) {
-                items['return-to-library'] = {
-                    text:     l10n.returnToLibrary,
-                    priority: -40,
-
-                    click:  function() {
-                        controller.render('library');
-                    }
-                };
-            }
 
             this.toolbarView = new media.view.Toolbar({
@@ -949 +979 @@
 
         initialize: function() {
+            _.defaults( this.options, {
+                clearable: true
+            });
+
             this.controller = this.options.controller;
             this.collection.on( 'add change:url remove', this.render, this );
@@ -955 +989 @@
 
         render: function() {
-            var options = {},
+            var options = _.clone( this.options ),
                 first, sizes, amount;
 

trunk/wp-includes/media.php

@@ -1359 +1359 @@
             <span class="count"><%- count %></span>
         </div>
-        <a class="clear-selection" href="#"><?php _e('Clear selection'); ?></a>
+        <% if ( clearable ) { %>
+            <a class="clear-selection" href="#"><?php _e('Clear selection'); ?></a>
+        <% } %>
     </script>
 

trunk/wp-includes/script-loader.php

@@ -329 +329 @@
 
         // Gallery
-        'returnToLibrary'       => __( 'Return to media library' ),
-        'insertGalleryIntoPost' => __( 'Insert gallery into post' ),
-        'updateGallery'         => __( 'Update gallery' ),
-        'addImagesFromLibrary'  => __( 'Add images from media library' ),
+        'returnToLibrary'        => __( 'Return to media library' ),
+        'continueEditingGallery' => __( 'Continue editing gallery' ),
+        'insertGalleryIntoPost'  => __( 'Insert gallery into post' ),
+        'updateGallery'          => __( 'Update gallery' ),
+        'addImagesFromLibrary'   => __( 'Add images from media library' ),
     ) );