Changeset 24940

Timestamp:

08/01/2013 01:15:14 PM (13 years ago)

Author:

nacin

Message:

Pass pluginPath to MediaElement.js, fixing playback when ME.js is served through load-scripts.php.

props ocean90, wonderboymusic, azaozz.
fixes #24902.

Location:

trunk/wp-includes

Files:

• js/mediaelement/wp-mediaelement.js (modified) (1 diff)
• link-template.php (modified) (1 diff)
• script-loader.php (modified) (1 diff)

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

@@ -4 +4 @@
         mejs.plugins.silverlight[0].types.push('audio/x-ms-wma');
 
-    $(function () {
-                $('.wp-audio-shortcode, .wp-video-shortcode').mediaelementplayer();
+        $(function () {
+                var settings = {};
+
+                if ( typeof _wpmejsSettings !== 'undefined' )
+                        settings.pluginPath = _wpmejsSettings.pluginPath;
+
+                $('.wp-audio-shortcode, .wp-video-shortcode').mediaelementplayer( settings );
         });
 

trunk/wp-includes/link-template.php

@@ -2021 +2021 @@
  *
  * @param string $path Optional. Path relative to the includes url.
+ * @param string $scheme Optional. Scheme to give the includes url context.
  * @return string Includes url link with optional path appended.
 */
-function includes_url($path = '') {
-        $url = site_url() . '/' . WPINC . '/';
+function includes_url( $path = '', $scheme = null ) {
+        $url = site_url( '/' . WPINC . '/', $scheme );
 
         if ( $path && is_string( $path ) )

trunk/wp-includes/script-loader.php

@@ -303 +303 @@
 
         $scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement.js", array('mediaelement'), false, 1 );
+        did_action( 'init' ) && $scripts->localize( 'wp-mediaelement', '_wpmejsSettings', array(
+                'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
+        ) );
 
         $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), false, 1 );