From e8b8e881b2bcfc32d0011c886986249073d99721 Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Sun, 11 May 2014 06:24:58 +0000
Subject: [PATCH] Allow users to set overrides for MediaElement instances by
 always passing `_wpmejsSettings` instead of just
 `_wpmejsSettings.pluginPath`.

Props Otto42 for the initial patch.
Fixes #25243.



git-svn-id: https://develop.svn.wordpress.org/trunk@28370 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/js/media-audiovideo.js             | 2 +-
 src/wp-includes/js/mediaelement/wp-mediaelement.js | 2 +-
 src/wp-includes/js/mediaelement/wp-playlist.js     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wp-includes/js/media-audiovideo.js b/src/wp-includes/js/media-audiovideo.js
index 8af5effa33..02fed8e859 100644
--- a/src/wp-includes/js/media-audiovideo.js
+++ b/src/wp-includes/js/media-audiovideo.js
@@ -6,7 +6,7 @@
 		l10n = typeof _wpMediaViewsL10n === 'undefined' ? {} : _wpMediaViewsL10n;
 
 	if ( ! _.isUndefined( window._wpmejsSettings ) ) {
-		baseSettings.pluginPath = _wpmejsSettings.pluginPath;
+		baseSettings = _wpmejsSettings;
 	}
 
 	/**
diff --git a/src/wp-includes/js/mediaelement/wp-mediaelement.js b/src/wp-includes/js/mediaelement/wp-mediaelement.js
index ca47399045..2caa81592b 100644
--- a/src/wp-includes/js/mediaelement/wp-mediaelement.js
+++ b/src/wp-includes/js/mediaelement/wp-mediaelement.js
@@ -12,7 +12,7 @@
 		}
 
 		if ( typeof _wpmejsSettings !== 'undefined' ) {
-			settings.pluginPath = _wpmejsSettings.pluginPath;
+			settings = _wpmejsSettings;
 		}
 
 		settings.success = function (mejs) {
diff --git a/src/wp-includes/js/mediaelement/wp-playlist.js b/src/wp-includes/js/mediaelement/wp-playlist.js
index ced70c6238..f90200e3a5 100644
--- a/src/wp-includes/js/mediaelement/wp-playlist.js
+++ b/src/wp-includes/js/mediaelement/wp-playlist.js
@@ -34,7 +34,7 @@
 			_.bindAll( this, 'bindPlayer', 'bindResetPlayer', 'setPlayer', 'ended', 'clickTrack' );
 
 			if ( ! _.isUndefined( window._wpmejsSettings ) ) {
-				this.settings.pluginPath = _wpmejsSettings.pluginPath;
+				this.settings = _wpmejsSettings;
 			}
 			this.settings.success = this.bindPlayer;
 			this.setPlayer();