<!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>[22743] trunk: Media: Dynamically generate attachment filters using get_post_mime_types().</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/22743">22743</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-21 10:18:59 +0000 (Wed, 21 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Dynamically generate attachment filters using get_post_mime_types().
Moves `get_post_mime_types()` from `wp-admin/includes/post.php` to `wp-includes/post.php`.
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="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpincludesjsmediamodelsjs">trunk/wp-includes/js/media-models.js</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>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (22742 => 22743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2012-11-21 09:35:23 UTC (rev 22742)
+++ trunk/wp-admin/includes/post.php 2012-11-21 10:18:59 UTC (rev 22743)
</span><span class="lines">@@ -876,23 +876,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get default post mime types
- *
- * @since 2.9.0
- *
- * @return array
- */
-function get_post_mime_types() {
- $post_mime_types = array( // array( adj, noun )
- 'image' => array(__('Images'), __('Manage Images'), _n_noop('Image <span class="count">(%s)</span>', 'Images <span class="count">(%s)</span>')),
- 'audio' => array(__('Audio'), __('Manage Audio'), _n_noop('Audio <span class="count">(%s)</span>', 'Audio <span class="count">(%s)</span>')),
- 'video' => array(__('Video'), __('Manage Video'), _n_noop('Video <span class="count">(%s)</span>', 'Video <span class="count">(%s)</span>')),
- );
-
- return apply_filters('post_mime_types', $post_mime_types);
-}
-
-/**
</del><span class="cx"> * {@internal Missing Short Description}}
</span><span class="cx"> *
</span><span class="cx"> * @since 2.5.0
</span></span></pre></div>
<a id="trunkwpincludesjsmediamodelsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-models.js (22742 => 22743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-models.js 2012-11-21 09:35:23 UTC (rev 22742)
+++ trunk/wp-includes/js/media-models.js 2012-11-21 10:18:59 UTC (rev 22743)
</span><span class="lines">@@ -671,6 +671,9 @@
</span><span class="cx"> // Generate the query `args` object.
</span><span class="cx"> // Correct any differing property names.
</span><span class="cx"> _.each( props, function( value, prop ) {
</span><ins>+ if ( _.isNull( value ) )
+ return;
+
</ins><span class="cx"> args[ Query.propmap[ prop ] || prop ] = value;
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22742 => 22743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-21 09:35:23 UTC (rev 22742)
+++ trunk/wp-includes/js/media-views.js 2012-11-21 10:18:59 UTC (rev 22743)
</span><span class="lines">@@ -2766,54 +2766,74 @@
</span><span class="cx"> change: 'change'
</span><span class="cx"> },
</span><span class="cx">
</span><del>- initialize: function() {
- var els;
</del><ins>+ filters: (function() {
+ var filters = {};
</ins><span class="cx">
</span><del>- els = _.map({
- all: 'allMediaItems',
- uploaded: 'uploadedToThisPost',
- image: 'images',
- audio: 'audio',
- video: 'videos'
- }, function( text, value ) {
- return this.make( 'option', { value: value }, l10n[ text ] );
- }, this );
</del><ins>+ _.each( media.view.settings.mimeTypes || {}, function( text, key ) {
+ filters[ key ] = {
+ text: text,
+ props: {
+ type: key,
+ parent: null
+ }
+ };
+ });
</ins><span class="cx">
</span><del>- this.$el.html( els );
</del><ins>+ filters.all = {
+ text: l10n.allMediaItems,
+ props: {
+ type: null,
+ parent: null
+ },
+ priority: 10
+ };
</ins><span class="cx">
</span><ins>+ filters.uploaded = {
+ text: l10n.uploadedToThisPost,
+ props: {
+ type: null,
+ parent: media.view.settings.postId
+ },
+ priority: 20
+ };
+
+ return filters;
+ }()),
+
+ 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() );
+
</ins><span class="cx"> this.model.on( 'change', this.select, this );
</span><span class="cx"> this.select();
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> change: function( event ) {
</span><del>- var model = this.model,
- value = this.el.value,
- type;
</del><ins>+ var filter = this.filters[ this.el.value ];
</ins><span class="cx">
</span><del>- 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');
</del><ins>+ if ( filter )
+ this.model.set( filter.props );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> select: function() {
</span><span class="cx"> var model = this.model,
</span><ins>+ value = 'all',
</ins><span class="cx"> type = model.get('type'),
</span><del>- value = 'all';
</del><ins>+ parent = model.get('parent'),
+ props = {
+ parent: _.isUndefined( parent ) ? null : parent,
+ type: _.isUndefined( type ) ? null : type
+ };
</ins><span class="cx">
</span><del>- 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';
</del><ins>+ _.find( this.filters, function( filter, key ) {
+ if ( _.isEqual( filter.props, props ) )
+ return value = key;
+ });
</ins><span class="cx">
</span><span class="cx"> this.$el.val( value );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (22742 => 22743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2012-11-21 09:35:23 UTC (rev 22742)
+++ trunk/wp-includes/media.php 2012-11-21 10:18:59 UTC (rev 22743)
</span><span class="lines">@@ -1322,10 +1322,9 @@
</span><span class="cx"> unset( $tabs['type'], $tabs['type_url'], $tabs['gallery'], $tabs['library'] );
</span><span class="cx">
</span><span class="cx"> $settings = array(
</span><del>- 'tabs' => $tabs,
- 'tabUrl' => add_query_arg( array(
- 'chromeless' => true
- ), admin_url('media-upload.php') ),
</del><ins>+ 'tabs' => $tabs,
+ 'tabUrl' => add_query_arg( array( 'chromeless' => true ), admin_url('media-upload.php') ),
+ 'mimeTypes' => wp_list_pluck( get_post_mime_types(), 0 ),
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $post = null;
</span><span class="lines">@@ -1354,16 +1353,12 @@
</span><span class="cx"> 'uploadMoreFiles' => __( 'Upload more files' ),
</span><span class="cx">
</span><span class="cx"> // Library
</span><del>- 'mediaLibraryTitle' => __( 'Media Library' ),
- 'createNewGallery' => __( 'Create a new gallery' ),
- 'insertIntoPost' => $hier ? __( 'Insert into page' ) : __( 'Insert into post' ),
- 'returnToLibrary' => __( '&#8592; Return to library' ),
-
</del><ins>+ 'mediaLibraryTitle' => __( 'Media Library' ),
+ 'createNewGallery' => __( 'Create a new gallery' ),
+ 'returnToLibrary' => __( '&#8592; Return to library' ),
</ins><span class="cx"> 'allMediaItems' => __( 'All media items' ),
</span><ins>+ 'insertIntoPost' => $hier ? __( 'Insert into page' ) : __( 'Insert into post' ),
</ins><span class="cx"> 'uploadedToThisPost' => $hier ? __( 'Uploaded to this page' ) : __( 'Uploaded to this post' ),
</span><del>- 'images' => __( 'Images' ),
- 'audio' => __( 'Audio' ),
- 'videos' => __( 'Videos' ),
</del><span class="cx">
</span><span class="cx"> // Embed
</span><span class="cx"> 'embedFromUrlTitle' => __( 'Embed From URL' ),
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (22742 => 22743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2012-11-21 09:35:23 UTC (rev 22742)
+++ trunk/wp-includes/post.php 2012-11-21 10:18:59 UTC (rev 22743)
</span><span class="lines">@@ -2180,6 +2180,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Get default post mime types
+ *
+ * @since 2.9.0
+ *
+ * @return array
+ */
+function get_post_mime_types() {
+ $post_mime_types = array( // array( adj, noun )
+ 'image' => array(__('Images'), __('Manage Images'), _n_noop('Image <span class="count">(%s)</span>', 'Images <span class="count">(%s)</span>')),
+ 'audio' => array(__('Audio'), __('Manage Audio'), _n_noop('Audio <span class="count">(%s)</span>', 'Audio <span class="count">(%s)</span>')),
+ 'video' => array(__('Video'), __('Manage Video'), _n_noop('Video <span class="count">(%s)</span>', 'Video <span class="count">(%s)</span>')),
+ );
+
+ return apply_filters('post_mime_types', $post_mime_types);
+}
+
+/**
</ins><span class="cx"> * Check a MIME-Type against a list.
</span><span class="cx"> *
</span><span class="cx"> * If the wildcard_mime_types parameter is a string, it must be comma separated
</span></span></pre>
</div>
</div>
</body>
</html>