Changeset 28364

Timestamp:

05/11/2014 02:06:36 AM (12 years ago)

Author:

wonderboymusic

Message:

When pausing "all" players attached to MCE views, don't reach into global scope and pause "every" player. Only pause the players bound to MCE views.

Fixes #27971.

Location:

trunk/src/wp-includes/js

Files:

• mce-view.js (modified) (4 diffs)
• media-audiovideo.js (modified) (3 diffs)

trunk/src/wp-includes/js/mce-view.js

@@ -372 +372 @@
                                 frame, data, callback;
 
-                        wp.media.mixin.pauseAllPlayers();
+                        $( document ).trigger( 'media:edit' );
 
                         data = window.decodeURIComponent( $( node ).attr('data-wpview-text') );
@@ -408 +408 @@
                         this.players = [];
                         this.shortcode = options.shortcode;
-                        _.bindAll( this, 'setPlayer' );
-                        $(this).on( 'ready', this.setPlayer );
+                        _.bindAll( this, 'setPlayer', 'pausePlayers' );
+                        $( this ).on( 'ready', this.setPlayer );
+                        $( 'body' ).on( 'click', '.wp-switch-editor', this.pausePlayers );
+                        $( document ).on( 'media:edit', this.pausePlayers );
                 },
 
@@ -525 +527 @@
                         this.attachments = [];
                         this.shortcode = options.shortcode;
+
+                        $( 'body' ).on( 'click', '.wp-switch-editor', this.pausePlayers );
+                        $( document ).on( 'media:edit', this.pausePlayers );
+
                         this.fetch();
                 },
@@ -688 +694 @@
                         unbind: function() {
                                 var self = this;
-                                this.pauseAllPlayers();
                                 _.each( this.players, function ( player ) {
+                                        player.pause();
                                         self.removePlayer( player );
                                 } );

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

@@ -25 +25 @@
                                 }
                         }
+                },
+
+                /**
+                 * Pauses the current object's instances of MediaElementPlayer
+                 */
+                pausePlayers: function() {
+                        _.each( this.players, function (player) {
+                                player.pause();
+                        } );
                 },
 
@@ -169 +178 @@
                 unsetPlayers : function() {
                         if ( this.players && this.players.length ) {
-                                wp.media.mixin.pauseAllPlayers();
                                 _.each( this.players, function (player) {
+                                        player.pause();
                                         wp.media.mixin.removePlayer( player );
                                 } );
@@ -912 +921 @@
         function init() {
                 $(document.body)
-                        .on( 'click', '.wp-switch-editor', wp.media.mixin.pauseAllPlayers )
                         .on( 'click', '.add-media-source', function( e ) {
                                 media.frame.lastMime = $( e.currentTarget ).data( 'mime' );