Ticket #25077: 25077.diff

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

@@ -6370 +6370 @@
         });
 
         /**
-         * wp.media.view.AudioDetails
+         * wp.media.view.MediaDetails
          *
          * @contructor
          * @augments wp.media.view.Settings.AttachmentDisplay
@@ -6379 +6379 @@
          * @augments wp.Backbone.View
          * @augments Backbone.View
          */
-        media.view.AudioDetails = media.view.Settings.AttachmentDisplay.extend({
-                className: 'audio-details',
-                template:  media.template('audio-details'),
-
+        media.view.MediaDetails = media.view.Settings.AttachmentDisplay.extend({
                 initialize: function() {
-                        _.bindAll(this, 'player', 'close');
+                        _.bindAll(this, 'success', 'close');
 
                         this.listenTo( this.controller, 'close', this.close );
 
@@ -6403 +6400 @@
                         }, this.options );
                 },
 
+                prepareSrc : function (media) {
+                        media.src = [
+                                media.src,
+                                media.src.indexOf('?') > -1 ? '&' : '?',
+                                (new Date()).getTime()
+                        ].join('');
+
+                        return media;
+                },
+
+                setPlayer : function () {
+                        this.player = false;
+                },
+
+                /**
+                 * 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.
+                 *
+                 */
+                remove: 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 mejs.players[t.id];
+
+                        t.container.remove();
+                        t.globalUnbind();
+                        delete t.node.player;
+                },
+
                 close : function() {
-                        this.mejs.pause();
+                        if ( this.player ) {
+                                this.mejs.pause();
+                                this.remove();
+                        }
                 },
 
-                player : function (mejs) {
+                success : function (mejs) {
+                        var autoplay = mejs.attributes.autoplay && 'false' !== mejs.attributes.autoplay;
+
+                        if ( 'flash' === mejs.pluginType && autoplay ) {
+                                mejs.addEventListener( 'canplay', function () {
+                                        mejs.play();
+                                }, false );
+                        }
+
                         this.mejs = mejs;
                 },
 
                 render: function() {
                         var self = this, settings = {
-                                success : this.player
+                                success : this.success
                         };
 
                         if ( ! _.isUndefined( window._wpmejsSettings ) ) {
@@ -6423 +6479 @@
                         media.view.Settings.AttachmentDisplay.prototype.render.apply( this, arguments );
                         setTimeout( function() { self.resetFocus(); }, 10 );
 
-                        new MediaElementPlayer( this.$('.wp-audio-shortcode').get(0), settings );
+                        this.setPlayer( settings );
 
                         return this;
                 },
@@ -6434 +6490 @@
         });
 
         /**
-         * wp.media.view.VideoDetails
+         * wp.media.view.AudioDetails
          *
          * @contructor
+         * @augments wp.media.view.MediaDetails
          * @augments wp.media.view.Settings.AttachmentDisplay
          * @augments wp.media.view.Settings
          * @augments wp.media.View
          * @augments wp.Backbone.View
          * @augments Backbone.View
          */
-        media.view.VideoDetails = media.view.Settings.AttachmentDisplay.extend({
-                className: 'video-details',
-                template:  media.template('video-details'),
+        media.view.AudioDetails = media.view.MediaDetails.extend({
+                className: 'audio-details',
+                template:  media.template('audio-details'),
 
-                initialize: function() {
-                        _.bindAll(this, 'success');
+                setPlayer: function( settings ) {
+                        var audio = this.$('.wp-audio-shortcode').get(0);
 
-                        this.listenTo( this.controller, 'close', this.close );
+                        audio = this.prepareSrc( audio );
 
-                        media.view.Settings.AttachmentDisplay.prototype.initialize.apply( this, arguments );
-                },
+                        this.player = new MediaElementPlayer( audio, settings );
+                        return this;
+                }
+        });
 
-                prepare: function() {
-                        var attachment = false;
+        /**
+         * wp.media.view.VideoDetails
+         *
+         * @contructor
+         * @augments wp.media.view.MediaDetails
+         * @augments wp.media.view.Settings.AttachmentDisplay
+         * @augments wp.media.view.Settings
+         * @augments wp.media.View
+         * @augments wp.Backbone.View
+         * @augments Backbone.View
+         */
+        media.view.VideoDetails = media.view.MediaDetails.extend({
+                className: 'video-details',
+                template:  media.template('video-details'),
 
-                        if ( this.model.attachment ) {
-                                attachment = this.model.attachment.toJSON();
-                        }
-                        return _.defaults({
-                                model: this.model.toJSON(),
-                                attachment: attachment
-                        }, this.options );
-                },
+                setPlayer: function( settings ) {
+                        var video = this.$('.wp-video-shortcode').get(0);
 
-                close : function() {
-                        this.mejs.pause();
-                        this.player.remove();
-                },
+                        video = this.prepareSrc( video );
 
-                success : function (mejs) {
-                        this.mejs = mejs;
-                },
-
-                render: function() {
-                        var video, self = this, settings = {
-                                success : this.success
-                        };
-
-                        if ( ! _.isUndefined( window._wpmejsSettings ) ) {
-                                settings.pluginPath = _wpmejsSettings.pluginPath;
-                        }
-
-                        media.view.Settings.AttachmentDisplay.prototype.render.apply( this, arguments );
-                        setTimeout( function() { self.resetFocus(); }, 10 );
-
-                        video = this.$('.wp-video-shortcode').get(0);
-                        video.src = [
-                                video.src,
-                                video.src.indexOf('?') > -1 ? '&' : '?',
-                                (new Date()).getTime()
-                        ].join('');
-
                         this.player = new MediaElementPlayer( video, settings );
                         return this;
-                },
-
-                resetFocus: function() {
-                        this.$( '.embed-media-settings' ).scrollTop( 0 );
                 }
         });
 

src/wp-includes/js/mediaelement/wp-mediaelement.js

@@ -7 +7 @@
         $(function () {
                 var settings = {};
 
-                if ( typeof _wpmejsSettings !== 'undefined' )
+                if ( typeof _wpmejsSettings !== 'undefined' ) {
                         settings.pluginPath = _wpmejsSettings.pluginPath;
+                }
 
+                settings.success = function (mejs) {
+                        var autoplay = mejs.attributes.autoplay && 'false' !== mejs.attributes.autoplay;
+                        if ( 'flash' === mejs.pluginType && autoplay ) {
+                                mejs.addEventListener( 'canplay', function () {
+                                        mejs.play();
+                                }, false );
+                        }
+                };
+
                 $('.wp-audio-shortcode, .wp-video-shortcode').mediaelementplayer( settings );
         });