<!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>[27788] trunk/src/wp-includes: Move counting of attachments for audio/video to the backend, instead of using a `reduce` function in JS.</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/27788">27788</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-03-27 18:15:09 +0000 (Thu, 27 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move counting of attachments for audio/video to the backend, instead of using a `reduce` function in JS.
See <a href="http://core.trac.wordpress.org/ticket/27554">#27554</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaaudiovideojs">trunk/src/wp-includes/js/media-audiovideo.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="trunksrcwpincludesjsmediaaudiovideojs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-audiovideo.js (27787 => 27788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-audiovideo.js 2014-03-27 18:14:05 UTC (rev 27787)
+++ trunk/src/wp-includes/js/media-audiovideo.js 2014-03-27 18:15:09 UTC (rev 27788)
</span><span class="lines">@@ -902,50 +902,6 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- _.extend( wp.media.playlist, {
- /**
- * Determine how many audio and video files the user has uploaded
- *
- * @global wp.media.view.settings
- *
- * @param {Object} settings
- * @returns {Object}
- */
- counts : (function(settings) {
- var counts = {};
-
- return function() {
- if ( ! _.isEmpty( counts ) ) {
- return counts;
- }
-
- var a = 0, v = 0;
- _.each( settings.attachmentCounts, function(total, mime) {
- var type;
- if ( -1 < mime.indexOf('/') ) {
- type = mime.split('/')[0];
-
- total = parseInt(total, 10);
-
- switch ( type ) {
- case 'audio':
- a += total;
- break;
- case 'video':
- v += total;
- break;
- }
- }
- } );
-
- counts.audio = a;
- counts.video = v;
-
- return counts;
- };
- }(media.view.settings))
- } );
-
</del><span class="cx"> /**
</span><span class="cx"> * Event binding
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media.php (27787 => 27788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media.php 2014-03-27 18:14:05 UTC (rev 27787)
+++ trunk/src/wp-includes/media.php 2014-03-27 18:15:09 UTC (rev 27788)
</span><span class="lines">@@ -2380,6 +2380,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $audio = $video = 0;
+ $counts = wp_count_attachments();
+ foreach ( $counts as $mime => $total ) {
+ if ( 0 === strpos( $mime, 'audio/' ) ) {
+ $audio += (int) $total;
+ } elseif ( 0 === strpos( $mime, 'video/' ) ) {
+ $video += (int) $total;
+ }
+ }
+
</ins><span class="cx"> $settings = array(
</span><span class="cx"> 'tabs' => $tabs,
</span><span class="cx"> 'tabUrl' => add_query_arg( array( 'chromeless' => true ), admin_url('media-upload.php') ),
</span><span class="lines">@@ -2392,7 +2402,10 @@
</span><span class="cx"> 'id' => 0,
</span><span class="cx"> ),
</span><span class="cx"> 'defaultProps' => $props,
</span><del>- 'attachmentCounts' => wp_count_attachments(),
</del><ins>+ 'attachmentCounts' => array(
+ 'audio' => $audio,
+ 'video' => $video
+ ),
</ins><span class="cx"> 'embedExts' => $exts,
</span><span class="cx"> 'embedMimes' => $ext_mimes,
</span><span class="cx"> 'contentWidth' => $content_width,
</span></span></pre>
</div>
</div>
</body>
</html>