<!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>[22712] trunk/wp-includes: Media: Add filters to the media library.</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/22712">22712</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-20 13:49:35 +0000 (Tue, 20 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Add filters to the media library. fixes <a href="http://core.trac.wordpress.org/ticket/22514">#22514</a>, see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescssmediaviewscss">trunk/wp-includes/css/media-views.css</a></li>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.js</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/media-views.css (22711 => 22712)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views.css 2012-11-20 12:58:29 UTC (rev 22711)
+++ trunk/wp-includes/css/media-views.css 2012-11-20 13:49:35 UTC (rev 22712)
</span><span class="lines">@@ -389,6 +389,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Attachment Browser Filters
+ */
+.media-frame select.attachment-filters {
+ margin-top: 11px;
+ margin-right: 10px;
+}
+
+/**
</ins><span class="cx"> * Search
</span><span class="cx"> */
</span><span class="cx"> .media-frame .search {
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22711 => 22712)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-20 12:58:29 UTC (rev 22711)
+++ trunk/wp-includes/js/media-views.js 2012-11-20 13:49:35 UTC (rev 22712)
</span><span class="lines">@@ -255,7 +255,8 @@
</span><span class="cx"> describe: false,
</span><span class="cx"> toolbar: 'main-attachments',
</span><span class="cx"> sidebar: 'settings',
</span><del>- searchable: true
</del><ins>+ searchable: true,
+ filterable: false
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> initialize: function() {
</span><span class="lines">@@ -334,7 +335,6 @@
</span><span class="cx"> content: function() {
</span><span class="cx"> var frame = this.frame;
</span><span class="cx">
</span><del>- // Content.
</del><span class="cx"> if ( this.get('empty') ) {
</span><span class="cx"> // Attempt to fetch any Attachments we don't already have.
</span><span class="cx"> this.get('library').more();
</span><span class="lines">@@ -354,7 +354,13 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _updateEmpty: function() {
</span><del>- var library = this.get('library');
</del><ins>+ var library = this.get('library'),
+ props = library.props;
+
+ // If we're filtering the library, bail.
+ if ( this.get('filterable') && ( props.get('type') || props.get('parent') ) )
+ return;
+
</ins><span class="cx"> this.set( 'empty', ! library.length && ! library.props.get('search') );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -1213,6 +1219,7 @@
</span><span class="cx"> sortable: state.get('sortable'),
</span><span class="cx"> search: state.get('searchable'),
</span><span class="cx"> upload: state.get('upload'),
</span><ins>+ filters: state.get('filterable'),
</ins><span class="cx">
</span><span class="cx"> AttachmentView: state.get('AttachmentView')
</span><span class="cx"> }) );
</span><span class="lines">@@ -1340,9 +1347,10 @@
</span><span class="cx"> this.states.add([
</span><span class="cx"> // Main states.
</span><span class="cx"> new media.controller.Library( _.defaults({
</span><del>- selection: options.selection,
- library: media.query( options.library ),
- editable: true
</del><ins>+ selection: options.selection,
+ library: media.query( options.library ),
+ editable: true,
+ filterable: true
</ins><span class="cx"> }, main ) ),
</span><span class="cx">
</span><span class="cx"> new media.controller.Upload( main ),
</span><span class="lines">@@ -2719,8 +2727,72 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ /**
+ * wp.media.view.AttachmentFilters
+ */
+ media.view.AttachmentFilters = media.View.extend({
+ tagName: 'select',
+ className: 'attachment-filters',
</ins><span class="cx">
</span><ins>+ events: {
+ change: 'change'
+ },
</ins><span class="cx">
</span><ins>+ initialize: function() {
+ var els;
+
+ els = _.map({
+ all: 'allMediaItems',
+ uploaded: 'uploadedToThisPost',
+ image: 'images',
+ audio: 'audio',
+ video: 'videos'
+ }, function( text, value ) {
+ return this.make( 'option', { value: value }, l10n[ text ] );
+ }, this );
+
+ this.$el.html( els );
+
+ this.model.on( 'change', this.select, this );
+ this.select();
+ },
+
+ change: function( event ) {
+ var model = this.model,
+ value = this.el.value,
+ type;
+
+ if ( 'all' === value || 'uploaded' === value )
+ model.unset('type');
+ else if ( 'image' === value || 'audio' === value || 'video' === value )
+ model.set( 'type', value );
+
+ if ( 'uploaded' === value )
+ model.set( 'parent', media.view.settings.postId );
+ else
+ model.unset('parent');
+ },
+
+ select: function() {
+ var model = this.model,
+ type = model.get('type'),
+ value = 'all';
+
+ if ( model.get('parent') === media.view.settings.postId )
+ value = 'uploaded';
+ else if ( 'image' === type )
+ value = 'image';
+ else if ( 'audio' === type )
+ value = 'audio';
+ else if ( 'video' === type )
+ value = 'video';
+
+ this.$el.val( value );
+ }
+ });
+
+
+
</ins><span class="cx"> /**
</span><span class="cx"> * wp.media.view.AttachmentsBrowser
</span><span class="cx"> */
</span><span class="lines">@@ -2732,9 +2804,9 @@
</span><span class="cx"> this.controller = this.options.controller;
</span><span class="cx">
</span><span class="cx"> _.defaults( this.options, {
</span><del>- search: true,
- upload: false,
- total: true,
</del><ins>+ filters: false,
+ search: true,
+ upload: false,
</ins><span class="cx">
</span><span class="cx"> AttachmentView: media.view.Attachment.Library
</span><span class="cx"> });
</span><span class="lines">@@ -2743,11 +2815,19 @@
</span><span class="cx"> controller: this.controller
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ if ( this.options.filters ) {
+ this.toolbar.set( 'filters', new media.view.AttachmentFilters({
+ controller: this.controller,
+ model: this.collection.props,
+ priority: -80
+ }).render() );
+ }
+
</ins><span class="cx"> if ( this.options.search ) {
</span><span class="cx"> this.toolbar.set( 'search', new media.view.Search({
</span><span class="cx"> controller: this.controller,
</span><span class="cx"> model: this.collection.props,
</span><del>- priority: -60
</del><ins>+ priority: 60
</ins><span class="cx"> }).render() );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (22711 => 22712)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2012-11-20 12:58:29 UTC (rev 22711)
+++ trunk/wp-includes/media.php 2012-11-20 13:49:35 UTC (rev 22712)
</span><span class="lines">@@ -1357,6 +1357,12 @@
</span><span class="cx"> 'insertIntoPost' => __( 'Insert into post' ),
</span><span class="cx"> 'returnToLibrary' => __( '&#8592; Return to library' ),
</span><span class="cx">
</span><ins>+ 'allMediaItems' => __( 'All media items' ),
+ 'uploadedToThisPost' => __( 'Uploaded to this post' ),
+ 'images' => __( 'Images' ),
+ 'audio' => __( 'Audio' ),
+ 'videos' => __( 'Videos' ),
+
</ins><span class="cx"> // Embed
</span><span class="cx"> 'embedFromUrlTitle' => __( 'Embed From URL' ),
</span><span class="cx"> 'insertEmbed' => __( 'Insert embed' ),
</span></span></pre>
</div>
</div>
</body>
</html>