Changeset 29426

Timestamp:

08/07/2014 04:43:36 AM (10 years ago)

Author:

wonderboymusic

Message:

In media.view.AttachmentFilters.All, make uploaded conditional upon media.view.settings.post.id and include a new filter: unattached.

Drop the mime-types filter and related class (which was added for Media Grid) and use all instead.

Props ocean90, wonderboymusic.
Fixes #29065.

Location:

trunk/src/wp-includes

Files:

• js/media-grid.js (modified) (1 diff)
• js/media-views.js (modified) (2 diffs)
• media.php (modified) (1 diff)

trunk/src/wp-includes/js/media-grid.js

@@ -132 +132 @@
                     content:            'browse',
                     contentUserSetting: false,
-                    filterable:         'mime-types'
+                    filterable:         'all'
                 })
             ]);

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

@@ -5620 +5620 @@
             };
 
-            filters.uploaded = {
-                text:  l10n.uploadedToThisPost,
+            if ( media.view.settings.post.id ) {
+                filters.uploaded = {
+                    text:  l10n.uploadedToThisPost,
+                    props: {
+                        type:    null,
+                        uploadedTo: media.view.settings.post.id,
+                        orderby: 'menuOrder',
+                        order:   'ASC'
+                    },
+                    priority: 20
+                };
+            }
+
+            filters.unattached = {
+                text:  l10n.unattached,
                 props: {
-                    type:    null,
-                    uploadedTo: media.view.settings.post.id,
-                    orderby: 'menuOrder',
-                    order:   'ASC'
+                    uploadedTo: 0,
+                    type:       null,
+                    orderby:    'menuOrder',
+                    order:      'ASC'
                 },
-                priority: 20
-            };
-
-            this.filters = filters;
-        }
-    });
-
-    /**
-     * wp.media.view.AttachmentFilters.FileTypes
-     *
-     * @constructor
-     * @augments wp.media.view.AttachmentFilters
-     * @augments wp.media.View
-     * @augments wp.Backbone.View
-     * @augments Backbone.View
-     */
-    media.view.AttachmentFilters.mimeTypes = media.view.AttachmentFilters.extend({
-        createFilters: function() {
-            var filters = {};
-
-            _.each( media.view.settings.mimeTypes || {}, function( text, key ) {
-                filters[ key ] = {
-                    text: text,
-                    props: {
-                        type:    key,
-                        uploadedTo: null,
-                        orderby: 'date',
-                        order:   'DESC'
-                    }
-                };
-            });
-            filters.all = {
-                text:  l10n.allMediaTypes,
-                props: {
-                    type:    null,
-                    uploadedTo: null,
-                    orderby: 'date',
-                    order:   'DESC'
-                },
-                priority: 10
+                priority: 50
             };
 
@@ -5764 +5738 @@
             } else if ( 'all' === filters ) {
                 FiltersConstructor = media.view.AttachmentFilters.All;
-            } else if ( 'mime-types' === filters ) {
-                FiltersConstructor = media.view.AttachmentFilters.mimeTypes;
             }
 

trunk/src/wp-includes/media.php

@@ -2924 +2924 @@
         'noItemsFound'           => __( 'No items found.' ),
         'insertIntoPost'         => $hier ? __( 'Insert into page' ) : __( 'Insert into post' ),
+        'unattached'             => __( 'Unattached' ),
         'uploadedToThisPost'     => $hier ? __( 'Uploaded to this page' ) : __( 'Uploaded to this post' ),
         'warnDelete'             => __( "You are about to permanently delete this item.\n  'Cancel' to stop, 'OK' to delete." ),