Changeset 27788

Timestamp:

03/27/2014 06:15:09 PM (11 years ago)

Author:

wonderboymusic

Message:

Move counting of attachments for audio/video to the backend, instead of using a reduce function in JS.

See #27554.

Location:

trunk/src/wp-includes

Files:

• js/media-audiovideo.js (modified) (1 diff)
• media.php (modified) (2 diffs)

trunk/src/wp-includes/js/media-audiovideo.js

@@ -903 +903 @@
     });
 
-    _.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))
-    } );
-
     /**
      * Event binding

trunk/src/wp-includes/media.php

@@ -2381 +2381 @@
     }
 
+    $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;
+        }
+    }
+
     $settings = array(
         'tabs'      => $tabs,
@@ -2393 +2403 @@
         ),
         'defaultProps' => $props,
-        'attachmentCounts' => wp_count_attachments(),
+        'attachmentCounts' => array(
+            'audio' => $audio,
+            'video' => $video
+        ),
         'embedExts'    => $exts,
         'embedMimes'   => $ext_mimes,