Changeset 29813

Timestamp:

10/02/2014 04:31:07 AM (10 years ago)

Author:

wonderboymusic

Message:

Add the date filter from media grid to the media modal.

Props janhenckens, wonderboymusic.
Fixes #28990.

Location:

trunk/src/wp-includes/js

Files:

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

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

@@ -730 +730 @@
     });
 
-    /**
-     * A filter dropdown for month/dates.
-     */
-    media.view.DateFilter = media.view.AttachmentFilters.extend({
-        id: 'media-attachment-date-filters',
-
-        createFilters: function() {
-            var filters = {};
-            _.each( media.view.settings.months || {}, function( value, index ) {
-                filters[ index ] = {
-                    text: value.text,
-                    props: {
-                        year: value.year,
-                        monthnum: value.month
-                    }
-                };
-            });
-            filters.all = {
-                text:  l10n.allDates,
-                props: {
-                    monthnum: false,
-                    year:  false
-                },
-                priority: 10
-            };
-            this.filters = filters;
-        }
-    });
-
 }(jQuery, _, Backbone, wp));

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

@@ -5751 +5751 @@
 
     /**
+     * A filter dropdown for month/dates.
+     *
+     * @constructor
+     * @augments wp.media.view.AttachmentFilters
+     * @augments wp.media.View
+     * @augments wp.Backbone.View
+     * @augments Backbone.View
+     */
+    media.view.DateFilter = media.view.AttachmentFilters.extend({
+        id: 'media-attachment-date-filters',
+
+        createFilters: function() {
+            var filters = {};
+            _.each( media.view.settings.months || {}, function( value, index ) {
+                filters[ index ] = {
+                    text: value.text,
+                    props: {
+                        year: value.year,
+                        monthnum: value.month
+                    }
+                };
+            });
+            filters.all = {
+                text:  l10n.allDates,
+                props: {
+                    monthnum: false,
+                    year:  false
+                },
+                priority: 10
+            };
+            this.filters = filters;
+        }
+    });
+
+    /**
      * wp.media.view.AttachmentFilters.Uploaded
      *
@@ -6111 +6146 @@
                 }
 
+            } else {
+                // DateFilter is a <select>, screen reader text needs to be rendered before
+                this.toolbar.set( 'dateFilterLabel', new media.view.Label({
+                    value: l10n.filterByDate,
+                    attributes: {
+                        'for': 'media-attachment-date-filters'
+                    },
+                    priority: -75
+                }).render() );
+                this.toolbar.set( 'dateFilter', new media.view.DateFilter({
+                    controller: this.controller,
+                    model:      this.collection.props,
+                    priority: -75
+                }).render() );
             }