WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.


Built from https://develop.svn.wordpress.org/trunk@28370


git-svn-id: http://core.svn.wordpress.org/trunk@28198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-05-11 06:25:15 +00:00
parent 558cf6f86d
commit aeadf0c7cf
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/js/media-audiovideo.js
View File

@ -6,7 +6,7 @@
l10n = typeof _wpMediaViewsL10n === 'undefined' ? {} : _wpMediaViewsL10n; l10n = typeof _wpMediaViewsL10n === 'undefined' ? {} : _wpMediaViewsL10n;
if ( ! _.isUndefined( window._wpmejsSettings ) ) { if ( ! _.isUndefined( window._wpmejsSettings ) ) {
baseSettings.pluginPath = _wpmejsSettings.pluginPath; baseSettings = _wpmejsSettings;
} }
/** /**

2
wp-includes/js/media-audiovideo.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/js/mediaelement/wp-mediaelement.js
View File

@ -12,7 +12,7 @@
} }
if ( typeof _wpmejsSettings !== 'undefined' ) { if ( typeof _wpmejsSettings !== 'undefined' ) {
settings.pluginPath = _wpmejsSettings.pluginPath; settings = _wpmejsSettings;
} }
settings.success = function (mejs) { settings.success = function (mejs) {

2
wp-includes/js/mediaelement/wp-playlist.js
View File

@ -34,7 +34,7 @@
_.bindAll( this, 'bindPlayer', 'bindResetPlayer', 'setPlayer', 'ended', 'clickTrack' ); _.bindAll( this, 'bindPlayer', 'bindResetPlayer', 'setPlayer', 'ended', 'clickTrack' );
if ( ! _.isUndefined( window._wpmejsSettings ) ) { if ( ! _.isUndefined( window._wpmejsSettings ) ) {
this.settings.pluginPath = _wpmejsSettings.pluginPath; this.settings = _wpmejsSettings;
} }
this.settings.success = this.bindPlayer; this.settings.success = this.bindPlayer;
this.setPlayer(); this.setPlayer();