From 3fba1e59d7a04bcb59d9b76b748ea5292ba8fd72 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Sat, 9 Jan 2016 02:21:28 +0000 Subject: [PATCH] Media: fix undefined error that prevents showing a preview in the media modal when replacing video or audio. Fixes #35363. git-svn-id: https://develop.svn.wordpress.org/trunk@36233 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/media-audiovideo.js | 6 ++++-- src/wp-includes/js/media/views/media-details.js | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/js/media-audiovideo.js b/src/wp-includes/js/media-audiovideo.js index 5c64097c9d..be45639c23 100644 --- a/src/wp-includes/js/media-audiovideo.js +++ b/src/wp-includes/js/media-audiovideo.js @@ -792,13 +792,15 @@ MediaDetails = AttachmentDisplay.extend({ * @global MediaElementPlayer */ setPlayer : function() { - var baseSettings; + var baseSettings, src; if ( this.players.length || ! this.media || this.scriptXhr ) { return; } - if ( this.model.get( 'src' ).indexOf( 'vimeo' ) > -1 && ! ( 'Froogaloop' in window ) ) { + src = this.model.get( 'src' ); + + if ( src && src.indexOf( 'vimeo' ) > -1 && ! ( 'Froogaloop' in window ) ) { baseSettings = wp.media.mixin.mejsSettings; this.scriptXhr = $.getScript( baseSettings.pluginPath + 'froogaloop.min.js', _.bind( this.loadPlayer, this ) ); } else { diff --git a/src/wp-includes/js/media/views/media-details.js b/src/wp-includes/js/media/views/media-details.js index a47c7a20b4..0a83c1c3d7 100644 --- a/src/wp-includes/js/media/views/media-details.js +++ b/src/wp-includes/js/media/views/media-details.js @@ -87,13 +87,15 @@ MediaDetails = AttachmentDisplay.extend({ * @global MediaElementPlayer */ setPlayer : function() { - var baseSettings; + var baseSettings, src; if ( this.players.length || ! this.media || this.scriptXhr ) { return; } - if ( this.model.get( 'src' ).indexOf( 'vimeo' ) > -1 && ! ( 'Froogaloop' in window ) ) { + src = this.model.get( 'src' ); + + if ( src && src.indexOf( 'vimeo' ) > -1 && ! ( 'Froogaloop' in window ) ) { baseSettings = wp.media.mixin.mejsSettings; this.scriptXhr = $.getScript( baseSettings.pluginPath + 'froogaloop.min.js', _.bind( this.loadPlayer, this ) ); } else {