Changeset 22743

Timestamp:

11/21/2012 10:18:59 AM (12 years ago)

Author:

koopersmith

Message:

Media: Dynamically generate attachment filters using get_post_mime_types().

Moves get_post_mime_types() from wp-admin/includes/post.php to wp-includes/post.php.

fixes #22514, see #21390.

Location:

trunk

Files:

• wp-admin/includes/post.php (modified) (1 diff)
• wp-includes/js/media-models.js (modified) (1 diff)
• wp-includes/js/media-views.js (modified) (2 diffs)
• wp-includes/media.php (modified) (2 diffs)
• wp-includes/post.php (modified) (1 diff)

trunk/wp-admin/includes/post.php

@@ -877 +877 @@
 
 /**
- * Get default post mime types
- *
- * @since 2.9.0
- *
- * @return array
- */
-function get_post_mime_types() {
-    $post_mime_types = array(   //  array( adj, noun )
-        'image' => array(__('Images'), __('Manage Images'), _n_noop('Image <span class="count">(%s)</span>', 'Images <span class="count">(%s)</span>')),
-        'audio' => array(__('Audio'), __('Manage Audio'), _n_noop('Audio <span class="count">(%s)</span>', 'Audio <span class="count">(%s)</span>')),
-        'video' => array(__('Video'), __('Manage Video'), _n_noop('Video <span class="count">(%s)</span>', 'Video <span class="count">(%s)</span>')),
-    );
-
-    return apply_filters('post_mime_types', $post_mime_types);
-}
-
-/**
  * {@internal Missing Short Description}}
  *

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

@@ -672 +672 @@
                 // Correct any differing property names.
                 _.each( props, function( value, prop ) {
+                    if ( _.isNull( value ) )
+                        return;
+
                     args[ Query.propmap[ prop ] || prop ] = value;
                 });

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

@@ -2767 +2767 @@
         },
 
+        filters: (function() {
+            var filters = {};
+
+            _.each( media.view.settings.mimeTypes || {}, function( text, key ) {
+                filters[ key ] = {
+                    text: text,
+                    props: {
+                        type:   key,
+                        parent: null
+                    }
+                };
+            });
+
+            filters.all = {
+                text:  l10n.allMediaItems,
+                props: {
+                    type:   null,
+                    parent: null
+                },
+                priority: 10
+            };
+
+            filters.uploaded = {
+                text:  l10n.uploadedToThisPost,
+                props: {
+                    type:   null,
+                    parent: media.view.settings.postId
+                },
+                priority: 20
+            };
+
+            return filters;
+        }()),
+
         initialize: function() {
-            var els;
-
-            els = _.map({
-                all:      'allMediaItems',
-                uploaded: 'uploadedToThisPost',
-                image:    'images',
-                audio:    'audio',
-                video:    'videos'
-            }, function( text, value ) {
-                return this.make( 'option', { value: value }, l10n[ text ] );
-            }, this );
-
-            this.$el.html( els );
+            // 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 );
@@ -2787 +2815 @@
 
         change: function( event ) {
-            var model = this.model,
-                value = this.el.value,
-                type;
-
-            if ( 'all' === value || 'uploaded' === value )
-                model.unset('type');
-            else if ( 'image' === value || 'audio' === value || 'video' === value )
-                model.set( 'type', value );
-
-            if ( 'uploaded' === value )
-                model.set( 'parent', media.view.settings.postId );
-            else
-                model.unset('parent');
+            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'),
-                value = 'all';
-
-            if ( model.get('parent') === media.view.settings.postId )
-                value = 'uploaded';
-            else if ( 'image' === type )
-                value = 'image';
-            else if ( 'audio' === type )
-                value = 'audio';
-            else if ( 'video' === type )
-                value = 'video';
+                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 );

trunk/wp-includes/media.php

@@ -1323 +1323 @@
 
     $settings = array(
-        'tabs'   => $tabs,
-        'tabUrl' => add_query_arg( array(
-            'chromeless' => true
-        ), admin_url('media-upload.php') ),
+        'tabs'      => $tabs,
+        'tabUrl'    => add_query_arg( array( 'chromeless' => true ), admin_url('media-upload.php') ),
+        'mimeTypes' => wp_list_pluck( get_post_mime_types(), 0 ),
     );
 
@@ -1355 +1354 @@
 
         // Library
-        'mediaLibraryTitle' => __( 'Media Library' ),
-        'createNewGallery'  => __( 'Create a new gallery' ),
-        'insertIntoPost'    =>  $hier ? __( 'Insert into page' ) : __( 'Insert into post' ),
-        'returnToLibrary'   => __( '← Return to library' ),
-
+        'mediaLibraryTitle'  => __( 'Media Library' ),
+        'createNewGallery'   => __( 'Create a new gallery' ),
+        'returnToLibrary'    => __( '← Return to library' ),
         'allMediaItems'      => __( 'All media items' ),
+        'insertIntoPost'     => $hier ? __( 'Insert into page' ) : __( 'Insert into post' ),
         'uploadedToThisPost' => $hier ? __( 'Uploaded to this page' ) : __( 'Uploaded to this post' ),
-        'images'             => __( 'Images' ),
-        'audio'              => __( 'Audio' ),
-        'videos'             => __( 'Videos' ),
 
         // Embed

trunk/wp-includes/post.php

@@ -2181 +2181 @@
 
 /**
+ * Get default post mime types
+ *
+ * @since 2.9.0
+ *
+ * @return array
+ */
+function get_post_mime_types() {
+    $post_mime_types = array(   //  array( adj, noun )
+        'image' => array(__('Images'), __('Manage Images'), _n_noop('Image <span class="count">(%s)</span>', 'Images <span class="count">(%s)</span>')),
+        'audio' => array(__('Audio'), __('Manage Audio'), _n_noop('Audio <span class="count">(%s)</span>', 'Audio <span class="count">(%s)</span>')),
+        'video' => array(__('Video'), __('Manage Video'), _n_noop('Video <span class="count">(%s)</span>', 'Video <span class="count">(%s)</span>')),
+    );
+
+    return apply_filters('post_mime_types', $post_mime_types);
+}
+
+/**
  * Check a MIME-Type against a list.
  *