From bb07d108036376a0f3fdfe0cd752828ea55bdb31 Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Thu, 2 Oct 2014 04:31:07 +0000
Subject: [PATCH] Add the `date` filter from media grid to the media modal.

Props janhenckens, wonderboymusic.
Fixes #28990.


git-svn-id: https://develop.svn.wordpress.org/trunk@29813 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/js/media-grid.js  | 29 ------------------
 src/wp-includes/js/media-views.js | 49 +++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/src/wp-includes/js/media-grid.js b/src/wp-includes/js/media-grid.js
index f6e81a8504..4785b4776f 100644
--- a/src/wp-includes/js/media-grid.js
+++ b/src/wp-includes/js/media-grid.js
@@ -729,33 +729,4 @@
 		}
 	});
 
-	/**
-	 * 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));
diff --git a/src/wp-includes/js/media-views.js b/src/wp-includes/js/media-views.js
index 3477365256..eacbdb1394 100644
--- a/src/wp-includes/js/media-views.js
+++ b/src/wp-includes/js/media-views.js
@@ -5749,6 +5749,41 @@
 		}
 	});
 
+	/**
+	 * 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
 	 *
@@ -6110,6 +6145,20 @@
 					}).render() );
 				}
 
+			} 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() );
 			}
 
 			if ( this.options.search ) {