<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29271] trunk/src: Media Grid: Add a date filter.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29271">29271</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2014-07-22 20:46:22 +0000 (Tue, 22 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Grid: Add a date filter.
props ericlewis.
fixes <a href="http://core.trac.wordpress.org/ticket/28895">#28895</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpincludesjsmediagridjs">trunk/src/wp-includes/js/media-grid.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/ajax-actions.php (29270 => 29271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/ajax-actions.php 2014-07-22 20:40:08 UTC (rev 29270)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2014-07-22 20:46:22 UTC (rev 29271)
</span><span class="lines">@@ -2156,7 +2156,7 @@
</span><span class="cx"> $query = isset( $_REQUEST['query'] ) ? (array) $_REQUEST['query'] : array();
</span><span class="cx"> $query = array_intersect_key( $query, array_flip( array(
</span><span class="cx"> 's', 'order', 'orderby', 'posts_per_page', 'paged', 'post_mime_type',
</span><del>- 'post_parent', 'post__in', 'post__not_in',
</del><ins>+ 'post_parent', 'post__in', 'post__not_in', 'year', 'monthnum'
</ins><span class="cx"> ) ) );
</span><span class="cx">
</span><span class="cx"> $query['post_type'] = 'attachment';
</span><span class="lines">@@ -2713,7 +2713,7 @@
</span><span class="cx"> if ( ! empty( $wp_scripts ) ) {
</span><span class="cx"> $wp_scripts->done = array();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 'playlist' === $_REQUEST['type'] ) {
</span><span class="cx"> wp_underscore_playlist_templates();
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediagridjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-grid.js (29270 => 29271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-grid.js 2014-07-22 20:40:08 UTC (rev 29270)
+++ trunk/src/wp-includes/js/media-grid.js 2014-07-22 20:46:22 UTC (rev 29271)
</span><span class="lines">@@ -448,7 +448,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Render the EditImage view into the frame's content region.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param {Object} contentRegion Basic object with a `view` property, which
</span><span class="cx"> * should be set with the proper region view.
</span><span class="cx"> */
</span><span class="lines">@@ -649,4 +649,33 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ /**
+ * 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;
+ }
+ });
+
</ins><span class="cx"> }(jQuery, _, Backbone, wp));
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29270 => 29271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-07-22 20:40:08 UTC (rev 29270)
+++ trunk/src/wp-includes/js/media-views.js 2014-07-22 20:46:22 UTC (rev 29271)
</span><span class="lines">@@ -5506,13 +5506,19 @@
</span><span class="cx"> this.select();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ /**
+ * @abstract
+ */
</ins><span class="cx"> createFilters: function() {
</span><span class="cx"> this.filters = {};
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ /**
+ * When the selection changes, set the Query properties
+ * accordingly for the selected filter.
+ */
</ins><span class="cx"> change: function() {
</span><span class="cx"> var filter = this.filters[ this.el.value ];
</span><del>-
</del><span class="cx"> if ( filter ) {
</span><span class="cx"> this.model.set( filter.props );
</span><span class="cx"> }
</span><span class="lines">@@ -5742,10 +5748,15 @@
</span><span class="cx"> priority: -90
</span><span class="cx"> }).render() );
</span><span class="cx">
</span><del>- this.toolbar.set( 'BulkSelection', new media.view.BulkSelection({
</del><ins>+ this.toolbar.set( 'bulkSelection', new media.view.BulkSelection({
</ins><span class="cx"> controller: this.controller,
</span><span class="cx"> priority: -70
</span><span class="cx"> }).render() );
</span><ins>+ this.toolbar.set( 'dateFilter', new media.view.DateFilter({
+ controller: this.controller,
+ model: this.collection.props,
+ priority: -75
+ }).render() );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> filters = this.options.filters;
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media.php (29270 => 29271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media.php 2014-07-22 20:40:08 UTC (rev 29270)
+++ trunk/src/wp-includes/media.php 2014-07-22 20:46:22 UTC (rev 29271)
</span><span class="lines">@@ -2772,7 +2772,7 @@
</span><span class="cx"> if ( did_action( 'wp_enqueue_media' ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- global $content_width, $wpdb;
</del><ins>+ global $content_width, $wpdb, $wp_locale;
</ins><span class="cx">
</span><span class="cx"> $defaults = array(
</span><span class="cx"> 'post' => null,
</span><span class="lines">@@ -2825,6 +2825,15 @@
</span><span class="cx"> AND post_mime_type LIKE 'video%'
</span><span class="cx"> LIMIT 1
</span><span class="cx"> " );
</span><ins>+ $months = $wpdb->get_results( $wpdb->prepare( "
+ SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
+ FROM $wpdb->posts
+ WHERE post_type = %s
+ ORDER BY post_date DESC
+ ", 'attachment' ) );
+ foreach ( $months as $month_year ) {
+ $month_year->text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month_year->month ), $month_year->year );
+ }
</ins><span class="cx">
</span><span class="cx"> $settings = array(
</span><span class="cx"> 'tabs' => $tabs,
</span><span class="lines">@@ -2846,6 +2855,7 @@
</span><span class="cx"> 'embedExts' => $exts,
</span><span class="cx"> 'embedMimes' => $ext_mimes,
</span><span class="cx"> 'contentWidth' => $content_width,
</span><ins>+ 'months' => $months,
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $post = null;
</span><span class="lines">@@ -2904,6 +2914,7 @@
</span><span class="cx"> 'returnToLibrary' => __( '← Return to library' ),
</span><span class="cx"> 'allMediaItems' => __( 'All media items' ),
</span><span class="cx"> 'allMediaTypes' => __( 'All media types' ),
</span><ins>+ 'allDates' => __( 'All dates' ),
</ins><span class="cx"> 'noItemsFound' => __( 'No items found.' ),
</span><span class="cx"> 'insertIntoPost' => $hier ? __( 'Insert into page' ) : __( 'Insert into post' ),
</span><span class="cx"> 'uploadedToThisPost' => $hier ? __( 'Uploaded to this page' ) : __( 'Uploaded to this post' ),
</span></span></pre>
</div>
</div>
</body>
</html>