Changeset 28370

Timestamp:

05/11/2014 06:24:58 AM (12 years ago)

Author:

wonderboymusic

Message:

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.

Location:

trunk/src/wp-includes/js

Files:

• media-audiovideo.js (modified) (1 diff)
• mediaelement/wp-mediaelement.js (modified) (1 diff)
• mediaelement/wp-playlist.js (modified) (1 diff)

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

@@ -7 +7 @@
 
         if ( ! _.isUndefined( window._wpmejsSettings ) ) {
-                baseSettings.pluginPath = _wpmejsSettings.pluginPath;
+                baseSettings = _wpmejsSettings;
         }
 

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

@@ -13 +13 @@
 
                 if ( typeof _wpmejsSettings !== 'undefined' ) {
-                        settings.pluginPath = _wpmejsSettings.pluginPath;
+                        settings = _wpmejsSettings;
                 }
 

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

@@ -35 +35 @@
 
                         if ( ! _.isUndefined( window._wpmejsSettings ) ) {
-                                this.settings.pluginPath = _wpmejsSettings.pluginPath;
+                                this.settings = _wpmejsSettings;
                         }
                         this.settings.success = this.bindPlayer;