<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[24941] branches/3.6: Pass pluginPath to MediaElement.js, fixing playback when ME.js is served through load-scripts.php.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24941">24941</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-08-01 13:18:01 +0000 (Thu, 01 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pass pluginPath to MediaElement.js, fixing playback when ME.js is served through load-scripts.php.
Merges <a href="http://core.trac.wordpress.org/changeset/24940">[24940]</a> to the 3.6 branch.
props ocean90, wonderboymusic, azaozz.
fixes <a href="http://core.trac.wordpress.org/ticket/24902">#24902</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches36wpincludesjsmediaelementwpmediaelementjs">branches/3.6/wp-includes/js/mediaelement/wp-mediaelement.js</a></li>
<li><a href="#branches36wpincludeslinktemplatephp">branches/3.6/wp-includes/link-template.php</a></li>
<li><a href="#branches36wpincludesscriptloaderphp">branches/3.6/wp-includes/script-loader.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches36">branches/3.6/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.6
</span><span class="cx">===================================================================
</span><del>--- branches/3.6 2013-08-01 13:15:14 UTC (rev 24940)
</del><ins>+++ branches/3.6 2013-08-01 13:18:01 UTC (rev 24941)
</ins><a id="branches36"></a>
<div class="propset"><h4>Property changes: branches/3.6</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1:18031
</span><span class="cx"> /branches/3.3:20543
</span><span class="cx"> /branches/3.4:21757
</span><del>-/trunk:18512,24817,24855,24861,24866,24868,24872,24875,24883-24886,24892,24894-24895,24902,24913,24915,24917,24931
</del><ins>+/trunk:18512,24817,24855,24861,24866,24868,24872,24875,24883-24886,24892,24894-24895,24902,24913,24915,24917,24931,24940
</ins><span class="cx">\ No newline at end of property
</span><a id="branches36wpincludesjsmediaelementwpmediaelementjs"></a>
<div class="modfile"><h4>Modified: branches/3.6/wp-includes/js/mediaelement/wp-mediaelement.js (24940 => 24941)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/wp-includes/js/mediaelement/wp-mediaelement.js 2013-08-01 13:15:14 UTC (rev 24940)
+++ branches/3.6/wp-includes/js/mediaelement/wp-mediaelement.js 2013-08-01 13:18:01 UTC (rev 24941)
</span><span class="lines">@@ -3,8 +3,13 @@
</span><span class="cx"> mejs.plugins.silverlight[0].types.push('video/x-ms-wmv');
</span><span class="cx"> mejs.plugins.silverlight[0].types.push('audio/x-ms-wma');
</span><span class="cx">
</span><del>- $(function () {
- $('.wp-audio-shortcode, .wp-video-shortcode').mediaelementplayer();
</del><ins>+ $(function () {
+ var settings = {};
+
+ if ( typeof _wpmejsSettings !== 'undefined' )
+ settings.pluginPath = _wpmejsSettings.pluginPath;
+
+ $('.wp-audio-shortcode, .wp-video-shortcode').mediaelementplayer( settings );
</ins><span class="cx"> });
</span><span class="cx">
</span><del>-}(jQuery));
</del><span class="cx">\ No newline at end of file
</span><ins>+}(jQuery));
</ins></span></pre></div>
<a id="branches36wpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: branches/3.6/wp-includes/link-template.php (24940 => 24941)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/wp-includes/link-template.php 2013-08-01 13:15:14 UTC (rev 24940)
+++ branches/3.6/wp-includes/link-template.php 2013-08-01 13:18:01 UTC (rev 24941)
</span><span class="lines">@@ -2020,10 +2020,11 @@
</span><span class="cx"> * @since 2.6.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $path Optional. Path relative to the includes url.
</span><ins>+ * @param string $scheme Optional. Scheme to give the includes url context.
</ins><span class="cx"> * @return string Includes url link with optional path appended.
</span><span class="cx"> */
</span><del>-function includes_url($path = '') {
- $url = site_url() . '/' . WPINC . '/';
</del><ins>+function includes_url( $path = '', $scheme = null ) {
+ $url = site_url( '/' . WPINC . '/', $scheme );
</ins><span class="cx">
</span><span class="cx"> if ( $path && is_string( $path ) )
</span><span class="cx"> $url .= ltrim($path, '/');
</span></span></pre></div>
<a id="branches36wpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: branches/3.6/wp-includes/script-loader.php (24940 => 24941)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/wp-includes/script-loader.php 2013-08-01 13:15:14 UTC (rev 24940)
+++ branches/3.6/wp-includes/script-loader.php 2013-08-01 13:18:01 UTC (rev 24941)
</span><span class="lines">@@ -302,6 +302,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement.js", array('mediaelement'), false, 1 );
</span><ins>+ did_action( 'init' ) && $scripts->localize( 'wp-mediaelement', '_wpmejsSettings', array(
+ 'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
+ ) );
</ins><span class="cx">
</span><span class="cx"> $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), false, 1 );
</span><span class="cx"> did_action( 'init' ) && $scripts->localize( 'password-strength-meter', 'pwsL10n', array(
</span></span></pre>
</div>
</div>
</body>
</html>