Changeset 27538

Timestamp:

03/14/2014 01:47:24 PM (11 years ago)

Author:

wonderboymusic

Message:

Move removePlayer() and unsetPlayer() to wp.media.mixin so that other classes can take advantage of them.

• removePlayer() is an alternative to MediaElement's player removal method that does not re-add the audio|video element back to the DOM.
• unsetPlayer() will check for an existing player property on the passed instance and pause all players before calling unsetPlayer()

See #27389.

Location:

trunk/src/wp-includes/js

Files:

• media-editor.js (modified) (1 diff)
• media-views.js (modified) (2 diffs)

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

@@ -305 +305 @@
                     window.mejs.players[p].pause();
                 }
+            }
+        },
+
+        /**
+         * Override the MediaElement method for removing a player.
+         *  MediaElement tries to pull the audio/video tag out of
+         *  its container and re-add it to the DOM.
+         */
+        removePlayer: function() {
+            var t = this.player, featureIndex, feature;
+
+            // invoke features cleanup
+            for ( featureIndex in t.options.features ) {
+                feature = t.options.features[featureIndex];
+                if ( t['clean' + feature] ) {
+                    try {
+                        t['clean' + feature](t);
+                    } catch (e) {}
+                }
+            }
+
+            if ( ! t.isDynamic ) {
+                t.$node.remove();
+            }
+
+            if ( 'native' !== t.media.pluginType ) {
+                t.media.remove();
+            }
+
+            delete window.mejs.players[t.id];
+
+            t.container.remove();
+            t.globalUnbind();
+            delete t.node.player;
+        },
+
+        /**
+         * Allows any class that has set 'player' to a MediaElementPlayer
+         *  instance to remove the player when listening to events.
+         *
+         *  Examples: modal closes, shortcode properties are removed, etc.
+         */
+        unsetPlayer : function() {
+            if ( this.player ) {
+                wp.media.mixin.pauseAllPlayers();
+                wp.media.mixin.removePlayer.apply( this );
+                this.player = false;
             }
         }

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

@@ -6548 +6548 @@
     media.view.MediaDetails = media.view.Settings.AttachmentDisplay.extend({
         initialize: function() {
-            _.bindAll(this, 'success', 'unsetPlayer');
-
-            this.listenTo( this.controller, 'close', this.unsetPlayer );
+            _.bindAll(this, 'success');
+
+            this.listenTo( this.controller, 'close', media.mixin.unsetPlayer );
             this.on( 'ready', this.setPlayer );
-            this.on( 'media:setting:remove', this.unsetPlayer );
+            this.on( 'media:setting:remove', media.mixin.unsetPlayer, this );
             this.on( 'media:setting:remove', this.render );
             this.on( 'media:setting:remove', this.setPlayer );
@@ -6605 +6605 @@
         setMedia : function () {
             return this;
-        },
-
-        /**
-         * Override the MediaElement method for removing a player.
-         *  MediaElement tries to pull the audio/video tag out of
-         *  its container and re-add it to the DOM.
-         */
-        removePlayer: function() {
-            var t = this.player, featureIndex, feature;
-
-            // invoke features cleanup
-            for ( featureIndex in t.options.features ) {
-                feature = t.options.features[featureIndex];
-                if ( t['clean' + feature] ) {
-                    try {
-                        t['clean' + feature](t);
-                    } catch (e) {}
-                }
-            }
-
-            if ( ! t.isDynamic ) {
-                t.$node.remove();
-            }
-
-            if ( 'native' !== t.media.pluginType ) {
-                t.media.remove();
-            }
-
-            delete window.mejs.players[t.id];
-
-            t.container.remove();
-            t.globalUnbind();
-            delete t.node.player;
-        },
-
-        unsetPlayer : function() {
-            if ( this.player ) {
-                if ( _.isUndefined( this.mejs.pluginType ) ) {
-                    this.mejs.pause();
-                }
-                this.removePlayer();
-                this.player = false;
-            }
         },