Changeset 22022

Timestamp:

09/26/2012 09:40:02 PM (14 years ago)

Author:

koopersmith

Message:

Limit the featured image workflow to images only.

Adds the ability to set the values used to instantiate both the Workflow's library and selection.
Renames the Workflows internal _pending variable to prevent conflicts with a similarly named internal Backbone.Model variable.

see #21390, #21776.

Location:

trunk

Files:

• wp-admin/includes/meta-boxes.php (modified) (1 diff)
• wp-includes/js/media-views.js (modified) (8 diffs)

trunk/wp-admin/includes/meta-boxes.php

@@ -1031 +1031 @@
 
                         if ( ! workflow ) {
-                                workflow = wp.media();
+                                workflow = wp.media({
+                                        library: {
+                                                type: 'image'
+                                        }
+                                });
+
                                 workflow.selection.on( 'add', function( model ) {
                                         var sizes = model.get('sizes'),

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

@@ -17 +17 @@
         media.controller.Workflow = Backbone.Model.extend({
                 defaults: {
-                        multiple: false,
-                        view:     'library'
+                        multiple:  false,
+                        view:      'library',
+                        library:   {},
+                        selection: []
                 },
 
@@ -25 +27 @@
 
                         // Initialize view storage.
-                        this._views   = {};
-                        this._pending = {};
+                        this._views        = {};
+                        this._pendingViews = {};
 
                         // Initialize modal container view.
@@ -32 +34 @@
 
                         // Add default views.
-                        this.add( 'library', media.view.Workspace.Library, { collection: media.query() } );
+                        //
+                        // Use the `library` property to initialize the corresponding view,
+                        // then unset the property.
+                        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 } );
                 },
@@ -46 +56 @@
                 add: function( id, constructor, options ) {
                         this.remove( id );
-                        this._pending[ id ] = {
+                        this._pendingViews[ id ] = {
                                 view:    constructor,
                                 options: options
@@ -64 +74 @@
 
                         id = id || this.get('view');
-                        pending = this._pending[ id ];
+                        pending = this._pendingViews[ id ];
 
                         if ( ! this._views[ id ] && pending ) {
                                 this._views[ id ] = new pending.view( _.extend({ controller: this }, pending.options || {} ) );
-                                delete this._pending[ id ];
+                                delete this._pendingViews[ id ];
                                 this.trigger( 'init init:' + id, this._views[ id ] );
                         }
@@ -80 +90 @@
                 remove: function( id ) {
                         delete this._views[ id ];
-                        delete this._pending[ id ];
+                        delete this._pendingViews[ id ];
                         this.trigger( 'remove remove:' + id );
                         return this;
@@ -97 +107 @@
 
                         if ( ! view )
-                                return;
+                                return this;
 
                         view.render();
@@ -108 +118 @@
 
                         // Initialize workflow-specific models.
-                        this.selection = new Attachments();
+                        // Use the `selection` property to initialize the Attachments
+                        // collection, then unset the property.
+                        this.selection = new Attachments( this.get('selection') );
+                        this.unset('selection');
 
                         _.extend( this.selection, {