Changeset 22745

Timestamp:

11/21/2012 11:04:23 AM (12 years ago)

Author:

koopersmith

Message:

Media: Add filters for image-only libraries. see #22514, #21390.

Location:

trunk

Files:

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

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

@@ -1056 +1056 @@
             frame = wp.media( options );
 
+            frame.get('library').set( 'filterable', 'uploaded' );
+
             frame.toolbar.on( 'activate:select', function() {
                 frame.toolbar.view().set({

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

@@ -1369 +1369 @@
                     library:    media.query( options.library ),
                     editable:   true,
-                    filterable: true
+                    filterable: 'all'
                 }, main ) ),
 
@@ -1385 +1385 @@
 
                 new media.controller.Library( _.defaults({
-                    id:      'gallery-library',
-                    library: media.query({ type: 'image' })
+                    id:         'gallery-library',
+                    library:    media.query({ type: 'image' }),
+                    filterable: 'uploaded'
                 }, gallery ) ),
 
@@ -2767 +2768 @@
         },
 
+        filters: {},
+        keys: [],
+
+        initialize: function() {
+            // Build `<option>` elements.
+            this.$el.html( _.chain( this.filters ).map( function( filter, value ) {
+                return {
+                    el: this.make( 'option', { value: value }, filter.text ),
+                    priority: filter.priority || 50
+                };
+            }, this ).sortBy('priority').pluck('el').value() );
+
+            this.model.on( 'change', this.select, this );
+            this.select();
+        },
+
+        change: function( event ) {
+            var filter = this.filters[ this.el.value ];
+
+            if ( filter )
+                this.model.set( filter.props );
+        },
+
+        select: function() {
+            var model = this.model,
+                value = 'all',
+                props = model.toJSON();
+
+            _.find( this.filters, function( filter, id ) {
+                var equal = _.all( filter.props, function( prop, key ) {
+                    return prop === ( _.isUndefined( props[ key ] ) ? null : props[ key ] );
+                });
+
+                if ( equal )
+                    return value = id;
+            });
+
+            this.$el.val( value );
+        }
+    });
+
+    media.view.AttachmentFilters.Uploaded = media.view.AttachmentFilters.extend({
+        filters: {
+            all: {
+                text:  l10n.allMediaItems,
+                props: {
+                    parent: null
+                },
+                priority: 10
+            },
+
+            uploaded: {
+                text:  l10n.uploadedToThisPost,
+                props: {
+                    parent: media.view.settings.postId
+                },
+                priority: 20
+            }
+        }
+    });
+
+    media.view.AttachmentFilters.All = media.view.AttachmentFilters.extend({
         filters: (function() {
             var filters = {};
@@ -2799 +2862 @@
 
             return filters;
-        }()),
-
-        initialize: function() {
-            // Build `<option>` elements.
-            this.$el.html( _.chain( this.filters ).map( function( filter, value ) {
-                return {
-                    el: this.make( 'option', { value: value }, filter.text ),
-                    priority: filter.priority || 50
-                };
-            }, this ).sortBy('priority').pluck('el').value() );
-
-            this.model.on( 'change', this.select, this );
-            this.select();
-        },
-
-        change: function( event ) {
-            var filter = this.filters[ this.el.value ];
-
-            if ( filter )
-                this.model.set( filter.props );
-        },
-
-        select: function() {
-            var model = this.model,
-                value = 'all',
-                type = model.get('type'),
-                parent = model.get('parent'),
-                props = {
-                    parent: _.isUndefined( parent ) ? null : parent,
-                    type:   _.isUndefined( type ) ? null : type
-                };
-
-            _.find( this.filters, function( filter, key ) {
-                if ( _.isEqual( filter.props, props ) )
-                    return value = key;
-            });
-
-            this.$el.val( value );
-        }
+        }())
     });
 
@@ -2850 +2875 @@
 
         initialize: function() {
+            var filters, FiltersConstructor;
+
             this.controller = this.options.controller;
 
@@ -2864 +2891 @@
             });
 
-            if ( this.options.filters ) {
-                this.toolbar.set( 'filters', new media.view.AttachmentFilters({
+            filters = this.options.filters;
+            if ( 'uploaded' === filters )
+                FiltersConstructor = media.view.AttachmentFilters.Uploaded;
+            else if ( 'all' === filters )
+                FiltersConstructor = media.view.AttachmentFilters.All;
+
+            if ( FiltersConstructor ) {
+                this.toolbar.set( 'filters', new FiltersConstructor({
                     controller: this.controller,
                     model:      this.collection.props,