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

MediaElement, update `wp-mediaelement.js`: 

* create a public `initialize` method on the `wp.mediaelement` namespace
* make it idempotent to prevent nasty side-effects caused by initializing media elements more than once

Props bradyvercher.	
Fixes #32423.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34310 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-09-20 03:17:24 +00:00
parent cb54b8d5a7
commit b20e8dbf69
2 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,34 +1,61 @@
/* global mejs, _wpmejsSettings */
(function ($) {
(function( window, $ ) {
window.wp = window.wp || {};
// add mime-type aliases to MediaElement plugin support
mejs.plugins.silverlight[0].types.push('video/x-ms-wmv');
mejs.plugins.silverlight[0].types.push('audio/x-ms-wma');
$(function () {
function wpMediaElement() {
var settings = {};
if ( typeof _wpmejsSettings !== 'undefined' ) {
settings = _wpmejsSettings;
/**
* Initialize media elements.
*
* Ensures media elements that have already been initialized won't be
* processed again.
*
* @since 4.4.0
*/
function initialize() {
if ( typeof _wpmejsSettings !== 'undefined' ) {
settings = _wpmejsSettings;
}
settings.success = settings.success || function (mejs) {
var autoplay, loop;
if ( 'flash' === mejs.pluginType ) {
autoplay = mejs.attributes.autoplay && 'false' !== mejs.attributes.autoplay;
loop = mejs.attributes.loop && 'false' !== mejs.attributes.loop;
autoplay && mejs.addEventListener( 'canplay', function () {
mejs.play();
}, false );
loop && mejs.addEventListener( 'ended', function () {
mejs.play();
}, false );
}
};
// Only initialize new media elements.
$( '.wp-audio-shortcode, .wp-video-shortcode' )
.not( '.mejs-container' )
.filter(function () {
return ! $( this ).parent().hasClass( '.mejs-mediaelement' );
})
.mediaelementplayer( settings );
}
settings.success = settings.success || function (mejs) {
var autoplay, loop;
if ( 'flash' === mejs.pluginType ) {
autoplay = mejs.attributes.autoplay && 'false' !== mejs.attributes.autoplay;
loop = mejs.attributes.loop && 'false' !== mejs.attributes.loop;
autoplay && mejs.addEventListener( 'canplay', function () {
mejs.play();
}, false );
loop && mejs.addEventListener( 'ended', function () {
mejs.play();
}, false );
}
return {
initialize: initialize
};
}
$('.wp-audio-shortcode, .wp-video-shortcode').mediaelementplayer( settings );
});
window.wp.mediaelement = new wpMediaElement();
}(jQuery));
$( document ).on( 'ready', window.wp.mediaelement.initialize );
})( window, jQuery );

2
wp-includes/version.php
View File

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