Changeset 27535

Timestamp:

03/14/2014 12:42:57 PM (12 years ago)

Author:

wonderboymusic

Message:

Make media.view.VideoDetails.prepareSrc a static class method instead of an instance method. Properly pairs it with its incrementing instances property.

See #27389.

File:

• trunk/src/wp-includes/js/media-views.js (modified) (4 diffs)

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

@@ -6570 +6570 @@
                 },
 
+                removeSetting : function (e) {
+                        var wrap = $( e.currentTarget ).parent(), setting;
+
+                        setting = wrap.find( 'input' ).data( 'setting' );
+
+                        if ( setting ) {
+                                this.model.unset( setting );
+                                this.trigger( 'media:setting:remove', this );
+                        }
+
+                        wrap.remove();
+                },
+
+                setTracks : function () {
+                        var tracks = '';
+
+                        _.each( this.$('.content-track'), function (track) {
+                                tracks += $( track ).val();
+                        } );
+
+                        this.model.set( 'content', tracks );
+                        this.trigger( 'media:setting:remove', this );
+                },
+
+                setPlayer : function () {
+                        if ( ! this.player && this.media ) {
+                                this.player = new MediaElementPlayer( this.media, this.settings );
+                        }
+                },
+
+                /**
+                 * @abstract
+                 */
+                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;
+                        }
+                },
+
+                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.success
+                        };
+
+                        if ( ! _.isUndefined( window._wpmejsSettings ) ) {
+                                settings.pluginPath = _wpmejsSettings.pluginPath;
+                        }
+
+                        media.view.Settings.AttachmentDisplay.prototype.render.apply( this, arguments );
+                        setTimeout( function() { self.resetFocus(); }, 10 );
+
+                        this.settings = settings;
+
+                        return this.setMedia();
+                },
+
+                resetFocus: function() {
+                        this.$( '.embed-media-settings' ).scrollTop( 0 );
+                }
+        }, {
+                instances : 0,
+
                 /**
                  * When multiple players in the DOM contain the same src, things get weird.
@@ -6588 +6703 @@
 
                         return media;
-                },
-
-                removeSetting : function (e) {
-                        var wrap = $( e.currentTarget ).parent(), setting;
-
-                        setting = wrap.find( 'input' ).data( 'setting' );
-
-                        if ( setting ) {
-                                this.model.unset( setting );
-                                this.trigger( 'media:setting:remove', this );
-                        }
-
-                        wrap.remove();
-                },
-
-                setTracks : function () {
-                        var tracks = '';
-
-                        _.each( this.$('.content-track'), function (track) {
-                                tracks += $( track ).val();
-                        } );
-
-                        this.model.set( 'content', tracks );
-                        this.trigger( 'media:setting:remove', this );
-                },
-
-                setPlayer : function () {
-                        if ( ! this.player && this.media ) {
-                                this.player = new MediaElementPlayer( this.media, this.settings );
-                        }
-                },
-
-                /**
-                 * @abstract
-                 */
-                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;
-                        }
-                },
-
-                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.success
-                        };
-
-                        if ( ! _.isUndefined( window._wpmejsSettings ) ) {
-                                settings.pluginPath = _wpmejsSettings.pluginPath;
-                        }
-
-                        media.view.Settings.AttachmentDisplay.prototype.render.apply( this, arguments );
-                        setTimeout( function() { self.resetFocus(); }, 10 );
-
-                        this.settings = settings;
-
-                        return this.setMedia();
-                },
-
-                resetFocus: function() {
-                        this.$( '.embed-media-settings' ).scrollTop( 0 );
-                }
-        }, {
-                instances : 0
+                }
         });
 
@@ -6728 +6728 @@
                                         audio.show();
                                 }
-                                this.media = this.prepareSrc( audio.get(0) );
+                                this.media = media.view.MediaDetails.prepareSrc( audio.get(0) );
                         } else {
                                 audio.hide();
@@ -6762 +6762 @@
 
                                 if ( ! video.hasClass('youtube-video') ) {
-                                        this.media = this.prepareSrc( video.get(0) );
+                                        this.media = media.view.MediaDetails.prepareSrc( video.get(0) );
                                 } else {
                                         this.media = video.get(0);