Changeset 27658

Timestamp:

03/23/2014 03:15:35 AM (11 years ago)

Author:

wonderboymusic

Message:

When an HTML5 fallback button is pressed in the Audio or Video Details state, filter the library by that specific mime-type when the Add Audio|Video Source is activated.

See #27389.

Location:

trunk/src/wp-includes

Files:

• js/media-audiovideo.js (modified) (1 diff)
• js/media-views.js (modified) (1 diff)
• media-template.php (modified) (4 diffs)

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

@@ -1409 +1409 @@
         $(document.body)
             .on( 'click', '.wp-switch-editor', wp.media.mixin.pauseAllPlayers )
-            .on( 'click', '.add-media-source', function() {
-                media.frame.setState('add-' + media.frame.defaults.id + '-source');
+            .on( 'click', '.add-media-source', function( e ) {
+                media.frame.lastMime = $( e.currentTarget ).data( 'mime' );
+                media.frame.setState( 'add-' + media.frame.defaults.id + '-source' );
             } );
     }

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

@@ -1141 +1141 @@
         initialize: function( options ) {
             this.media = options.media;
-            this.set( 'library', media.query({ type: options.type }) );
+            this.type = options.type;
+            this.set( 'library', media.query({ type: this.type }) );
 
             media.controller.Library.prototype.initialize.apply( this, arguments );
+        },
+
+        activate: function() {
+            if ( media.frame.lastMime ) {
+                this.set( 'library', media.query({ type: media.frame.lastMime }) );
+                delete media.frame.lastMime;
+            }
+            media.controller.Library.prototype.activate.apply( this, arguments );
         }
     });

trunk/src/wp-includes/media-template.php

@@ -772 +772 @@
 
     <script type="text/html" id="tmpl-audio-details">
-        <# var ext, html5types = { mp3: true, ogg: true }; #>
+        <# var ext, html5types = {
+            mp3: wp.media.view.settings.embedMimes.mp3,
+            ogg: wp.media.view.settings.embedMimes.ogg
+        }; #>
 
         <?php $audio_types = wp_get_audio_extensions(); ?>
@@ -811 +814 @@
                     <span>{{{ wp.media.view.l10n.mediaHTML5Text }}}</span>
                     <div class="button-large">
-                    <# _.each( html5types, function (value, type) { #>
-                    <button class="button add-media-source">{{ type }}</button>
+                    <# _.each( html5types, function (mime, type) { #>
+                    <button class="button add-media-source" data-mime="{{ mime }}">{{ type }}</button>
                     <# } ) #>
                     </div>
@@ -848 +851 @@
 
     <script type="text/html" id="tmpl-video-details">
-        <# var ext, html5types = { mp4: true, ogv: true, webm: true }; #>
+        <# var ext, html5types = {
+            mp4: wp.media.view.settings.embedMimes.mp4,
+            ogv: wp.media.view.settings.embedMimes.ogv,
+            webm: wp.media.view.settings.embedMimes.webm
+        }; #>
 
         <?php $video_types = wp_get_video_extensions(); ?>
@@ -897 +904 @@
                     <span>{{{ wp.media.view.l10n.mediaHTML5Text }}}</span>
                     <div class="button-large">
-                    <# _.each( html5types, function (value, type) { #>
-                    <button class="button add-media-source">{{ type }}</button>
+                    <# _.each( html5types, function (mime, type) { #>
+                    <button class="button add-media-source" data-mime="{{ mime }}">{{ type }}</button>
                     <# } ) #>
                     </div>