<!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>[22745] trunk: Media: Add filters for image-only libraries.</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, #logmsg > ol { margin-left: 0; 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/22745">22745</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-21 11:04:23 +0000 (Wed, 21 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Add filters for image-only libraries. see <a href="http://core.trac.wordpress.org/ticket/22514">#22514</a>, <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (22744 => 22745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2012-11-21 10:58:28 UTC (rev 22744)
+++ trunk/wp-admin/includes/meta-boxes.php 2012-11-21 11:04:23 UTC (rev 22745)
</span><span class="lines">@@ -1055,6 +1055,8 @@
</span><span class="cx">
</span><span class="cx"> frame = wp.media( options );
</span><span class="cx">
</span><ins>+ frame.get('library').set( 'filterable', 'uploaded' );
+
</ins><span class="cx"> frame.toolbar.on( 'activate:select', function() {
</span><span class="cx"> frame.toolbar.view().set({
</span><span class="cx"> select: {
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22744 => 22745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-21 10:58:28 UTC (rev 22744)
+++ trunk/wp-includes/js/media-views.js 2012-11-21 11:04:23 UTC (rev 22745)
</span><span class="lines">@@ -1368,7 +1368,7 @@
</span><span class="cx"> selection: options.selection,
</span><span class="cx"> library: media.query( options.library ),
</span><span class="cx"> editable: true,
</span><del>- filterable: true
</del><ins>+ filterable: 'all'
</ins><span class="cx"> }, main ) ),
</span><span class="cx">
</span><span class="cx"> new media.controller.Upload( main ),
</span><span class="lines">@@ -1384,8 +1384,9 @@
</span><span class="cx"> }),
</span><span class="cx">
</span><span class="cx"> new media.controller.Library( _.defaults({
</span><del>- id: 'gallery-library',
- library: media.query({ type: 'image' })
</del><ins>+ id: 'gallery-library',
+ library: media.query({ type: 'image' }),
+ filterable: 'uploaded'
</ins><span class="cx"> }, gallery ) ),
</span><span class="cx">
</span><span class="cx"> new media.controller.Upload( _.defaults({
</span><span class="lines">@@ -2766,6 +2767,68 @@
</span><span class="cx"> change: 'change'
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ filters: {},
+ keys: [],
+
+ initialize: function() {
+ // Build `<option>` elements.
+ this.$el.html( _.chain( this.filters ).map( function( filter, value ) {
+ return {
+ el: this.make( 'option', { value: value }, filter.text ),
+ priority: filter.priority || 50
+ };
+ }, this ).sortBy('priority').pluck('el').value() );
+
+ this.model.on( 'change', this.select, this );
+ this.select();
+ },
+
+ change: function( event ) {
+ var filter = this.filters[ this.el.value ];
+
+ if ( filter )
+ this.model.set( filter.props );
+ },
+
+ select: function() {
+ var model = this.model,
+ value = 'all',
+ props = model.toJSON();
+
+ _.find( this.filters, function( filter, id ) {
+ var equal = _.all( filter.props, function( prop, key ) {
+ return prop === ( _.isUndefined( props[ key ] ) ? null : props[ key ] );
+ });
+
+ if ( equal )
+ return value = id;
+ });
+
+ this.$el.val( value );
+ }
+ });
+
+ media.view.AttachmentFilters.Uploaded = media.view.AttachmentFilters.extend({
+ filters: {
+ all: {
+ text: l10n.allMediaItems,
+ props: {
+ parent: null
+ },
+ priority: 10
+ },
+
+ uploaded: {
+ text: l10n.uploadedToThisPost,
+ props: {
+ parent: media.view.settings.postId
+ },
+ priority: 20
+ }
+ }
+ });
+
+ media.view.AttachmentFilters.All = media.view.AttachmentFilters.extend({
</ins><span class="cx"> filters: (function() {
</span><span class="cx"> var filters = {};
</span><span class="cx">
</span><span class="lines">@@ -2798,45 +2861,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> return filters;
</span><del>- }()),
-
- initialize: function() {
- // Build `<option>` elements.
- this.$el.html( _.chain( this.filters ).map( function( filter, value ) {
- return {
- el: this.make( 'option', { value: value }, filter.text ),
- priority: filter.priority || 50
- };
- }, this ).sortBy('priority').pluck('el').value() );
-
- this.model.on( 'change', this.select, this );
- this.select();
- },
-
- change: function( event ) {
- var filter = this.filters[ this.el.value ];
-
- if ( filter )
- this.model.set( filter.props );
- },
-
- select: function() {
- var model = this.model,
- value = 'all',
- type = model.get('type'),
- parent = model.get('parent'),
- props = {
- parent: _.isUndefined( parent ) ? null : parent,
- type: _.isUndefined( type ) ? null : type
- };
-
- _.find( this.filters, function( filter, key ) {
- if ( _.isEqual( filter.props, props ) )
- return value = key;
- });
-
- this.$el.val( value );
- }
</del><ins>+ }())
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -2849,6 +2874,8 @@
</span><span class="cx"> className: 'attachments-browser',
</span><span class="cx">
</span><span class="cx"> initialize: function() {
</span><ins>+ var filters, FiltersConstructor;
+
</ins><span class="cx"> this.controller = this.options.controller;
</span><span class="cx">
</span><span class="cx"> _.defaults( this.options, {
</span><span class="lines">@@ -2863,8 +2890,14 @@
</span><span class="cx"> controller: this.controller
</span><span class="cx"> });
</span><span class="cx">
</span><del>- if ( this.options.filters ) {
- this.toolbar.set( 'filters', new media.view.AttachmentFilters({
</del><ins>+ filters = this.options.filters;
+ if ( 'uploaded' === filters )
+ FiltersConstructor = media.view.AttachmentFilters.Uploaded;
+ else if ( 'all' === filters )
+ FiltersConstructor = media.view.AttachmentFilters.All;
+
+ if ( FiltersConstructor ) {
+ this.toolbar.set( 'filters', new FiltersConstructor({
</ins><span class="cx"> controller: this.controller,
</span><span class="cx"> model: this.collection.props,
</span><span class="cx"> priority: -80
</span></span></pre>
</div>
</div>
</body>
</html>