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

External Libraries: Update MediaElement.js from upstream. 

Merge of [37370] to the 4.5 branch.
Built from https://develop.svn.wordpress.org/branches/4.5@37371


git-svn-id: http://core.svn.wordpress.org/branches/4.5@37337 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-05-06 17:52:29 +00:00
parent d7f37d8bc0
commit a9a70e1bfb
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
wp-includes/js/mediaelement/flashmediaelement.swf
View File

Binary file not shown.

4
wp-includes/js/mediaelement/mediaelement-and-player.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/script-loader.php
View File

@ -333,7 +333,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), false, 1 );
$scripts->add( 'mediaelement', "/wp-includes/js/mediaelement/mediaelement-and-player.min.js", array('jquery'), '2.18.1', 1 );
$scripts->add( 'mediaelement', "/wp-includes/js/mediaelement/mediaelement-and-player.min.js", array('jquery'), '2.18.1-a', 1 );
did_action( 'init' ) && $scripts->localize( 'mediaelement', 'mejsL10n', array(
'language' => get_bloginfo( 'language' ),
'strings' => array(

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.5.2-alpha-37312';
$wp_version = '4.5.2-alpha-37371';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.