<!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>[29426] trunk/src/wp-includes: In `media.view.AttachmentFilters.All`, make `uploaded` conditional upon `media.view.settings.post.id` and include a new filter: `unattached`.</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/29426">29426</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-08-07 04:43:36 +0000 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/29065">#29065</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunksrcwpincludesjsmediagridjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-grid.js (29425 => 29426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-grid.js 2014-08-07 03:03:28 UTC (rev 29425)
+++ trunk/src/wp-includes/js/media-grid.js 2014-08-07 04:43:36 UTC (rev 29426)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> title: options.title,
</span><span class="cx"> content: 'browse',
</span><span class="cx"> contentUserSetting: false,
</span><del>- filterable: 'mime-types'
</del><ins>+ filterable: 'all'
</ins><span class="cx"> })
</span><span class="cx"> ]);
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29425 => 29426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-08-07 03:03:28 UTC (rev 29425)
+++ trunk/src/wp-includes/js/media-views.js 2014-08-07 04:43:36 UTC (rev 29426)
</span><span class="lines">@@ -5619,54 +5619,28 @@
</span><span class="cx"> priority: 10
</span><span class="cx"> };
</span><span class="cx">
</span><del>- filters.uploaded = {
- text: l10n.uploadedToThisPost,
- props: {
- type: null,
- uploadedTo: media.view.settings.post.id,
- 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,
</del><ins>+ if ( media.view.settings.post.id ) {
+ filters.uploaded = {
+ text: l10n.uploadedToThisPost,
</ins><span class="cx"> props: {
</span><del>- type: key,
- uploadedTo: null,
- orderby: 'date',
- order: 'DESC'
- }
</del><ins>+ type: null,
+ uploadedTo: media.view.settings.post.id,
+ orderby: 'menuOrder',
+ order: 'ASC'
+ },
+ priority: 20
</ins><span class="cx"> };
</span><del>- });
- filters.all = {
- text: l10n.allMediaTypes,
</del><ins>+ }
+
+ filters.unattached = {
+ text: l10n.unattached,
</ins><span class="cx"> props: {
</span><del>- type: null,
- uploadedTo: null,
- orderby: 'date',
- order: 'DESC'
</del><ins>+ uploadedTo: 0,
+ type: null,
+ orderby: 'menuOrder',
+ order: 'ASC'
</ins><span class="cx"> },
</span><del>- priority: 10
</del><ins>+ priority: 50
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> this.filters = filters;
</span><span class="lines">@@ -5763,8 +5737,6 @@
</span><span class="cx"> FiltersConstructor = media.view.AttachmentFilters.Uploaded;
</span><span class="cx"> } else if ( 'all' === filters ) {
</span><span class="cx"> FiltersConstructor = media.view.AttachmentFilters.All;
</span><del>- } else if ( 'mime-types' === filters ) {
- FiltersConstructor = media.view.AttachmentFilters.mimeTypes;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( FiltersConstructor ) {
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media.php (29425 => 29426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media.php 2014-08-07 03:03:28 UTC (rev 29425)
+++ trunk/src/wp-includes/media.php 2014-08-07 04:43:36 UTC (rev 29426)
</span><span class="lines">@@ -2923,6 +2923,7 @@
</span><span class="cx"> 'allDates' => __( 'All dates' ),
</span><span class="cx"> 'noItemsFound' => __( 'No items found.' ),
</span><span class="cx"> 'insertIntoPost' => $hier ? __( 'Insert into page' ) : __( 'Insert into post' ),
</span><ins>+ 'unattached' => __( 'Unattached' ),
</ins><span class="cx"> 'uploadedToThisPost' => $hier ? __( 'Uploaded to this page' ) : __( 'Uploaded to this post' ),
</span><span class="cx"> 'warnDelete' => __( "You are about to permanently delete this item.\n 'Cancel' to stop, 'OK' to delete." ),
</span><span class="cx"> 'warnBulkDelete' => __( "You are about to permanently delete these items.\n 'Cancel' to stop, 'OK' to delete." ),
</span></span></pre>
</div>
</div>
</body>
</html>