Changeset 27537

Timestamp:

03/14/2014 01:16:07 PM (12 years ago)

Author:

wonderboymusic

Message:

Rather than extending wp.media.mixin, only borrow coerce when necessary in wp.media.audio|video|collection. wp.media.mixin will make sense to be mixed in for classes that expect to interact with the player. More universal methods can be added and inherited by all those who extend their prototype with it.

Assuming someone had implemented players in the editor, pause all players when switching between editor tabs. A method, pauseAllPlayers, has been added to wp.media.mixin.

See #27389.

File:

• trunk/src/wp-includes/js/media-editor.js (modified) (6 diffs)

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

@@ -297 +297 @@
                         }
                         return attrs[ key ];
+                },
+
+                pauseAllPlayers: function () {
+                        var p;
+                        if ( window.mejs && window.mejs.players ) {
+                                for ( p in window.mejs.players ) {
+                                        window.mejs.players[p].pause();
+                                }
+                        }
                 }
         };
@@ -303 +312 @@
                 var collections = {};
 
-                return _.extend( attributes, wp.media.mixin, {
+                return _.extend( attributes, {
+                        coerce : wp.media.mixin.coerce,
                         /**
                          * Retrieve attachments based on the properties of the passed shortcode
@@ -559 +569 @@
          * @namespace
          */
-        wp.media.audio = _.extend({
+        wp.media.audio = {
+                coerce : wp.media.mixin.coerce,
+
                 defaults : {
                         id : wp.media.view.settings.post.id,
@@ -598 +610 @@
                         });
                 }
-        }, wp.media.mixin);
+        };
 
         /**
          * @namespace
          */
-        wp.media.video = _.extend({
+        wp.media.video = {
+                coerce : wp.media.mixin.coerce,
+
                 defaults : {
                         id : wp.media.view.settings.post.id,
@@ -650 +664 @@
                         });
                 }
-        }, wp.media.mixin);
+        };
 
         /**
@@ -1112 +1126 @@
                  */
                 init: function() {
-                        $(document.body).on( 'click', '.insert-media', function( event ) {
-                                var elem = $( event.currentTarget ),
-                                        editor = elem.data('editor'),
-                                        options = {
-                                                frame:    'post',
-                                                state:    'insert',
-                                                title:    wp.media.view.l10n.addMedia,
-                                                multiple: true
-                                        };
-
-                                event.preventDefault();
-
-                                // Remove focus from the `.insert-media` button.
-                                // Prevents Opera from showing the outline of the button
-                                // above the modal.
-                                //
-                                // See: http://core.trac.wordpress.org/ticket/22445
-                                elem.blur();
-
-                                if ( elem.hasClass( 'gallery' ) ) {
-                                        options.state = 'gallery';
-                                        options.title = wp.media.view.l10n.createGalleryTitle;
-                                } else if ( elem.hasClass( 'playlist' ) ) {
-                                        options.state = 'playlist';
-                                        options.title = wp.media.view.l10n.createPlaylistTitle;
-                                } else if ( elem.hasClass( 'video-playlist' ) ) {
-                                        options.state = 'video-playlist';
-                                        options.title = wp.media.view.l10n.createVideoPlaylistTitle;
-                                }
-
-                                wp.media.editor.open( editor, options );
-                        });
+                        $(document.body)
+                                .on( 'click', '.insert-media', function( event ) {
+                                        var elem = $( event.currentTarget ),
+                                                editor = elem.data('editor'),
+                                                options = {
+                                                        frame:    'post',
+                                                        state:    'insert',
+                                                        title:    wp.media.view.l10n.addMedia,
+                                                        multiple: true
+                                                };
+
+                                        event.preventDefault();
+
+                                        // Remove focus from the `.insert-media` button.
+                                        // Prevents Opera from showing the outline of the button
+                                        // above the modal.
+                                        //
+                                        // See: http://core.trac.wordpress.org/ticket/22445
+                                        elem.blur();
+
+                                        if ( elem.hasClass( 'gallery' ) ) {
+                                                options.state = 'gallery';
+                                                options.title = wp.media.view.l10n.createGalleryTitle;
+                                        } else if ( elem.hasClass( 'playlist' ) ) {
+                                                options.state = 'playlist';
+                                                options.title = wp.media.view.l10n.createPlaylistTitle;
+                                        } else if ( elem.hasClass( 'video-playlist' ) ) {
+                                                options.state = 'video-playlist';
+                                                options.title = wp.media.view.l10n.createVideoPlaylistTitle;
+                                        }
+
+                                        wp.media.editor.open( editor, options );
+                                })
+                                .on( 'click', '.wp-switch-editor', wp.media.mixin.pauseAllPlayers );
 
                         // Initialize and render the Editor drag-and-drop uploader.