sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Load MediaElement's CSS when TinyMCE is loaded via `$mce_css` in `editor_settings()`. Add some baseline styles in `wp-content.css` for audio, video, and embed tags to ensure their `max-width` is `100%`, regardless of whether MEjs is implemented in TinyMCE. 

See #27389.



git-svn-id: https://develop.svn.wordpress.org/trunk@27534 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2014-03-14 12:33:24 +00:00
parent 4a2ffa917c
commit 86722dfaaa
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wp-includes/class-wp-editor.php
View File

@ -343,9 +343,16 @@ final class _WP_Editors {
$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
$version = 'ver=' . $GLOBALS['wp_version']; $version = 'ver=' . $GLOBALS['wp_version'];
$dashicons = includes_url( "css/dashicons$suffix.css?$version" ); $dashicons = includes_url( "css/dashicons$suffix.css?$version" );
$mediaelement = includes_url( "js/mediaelement/mediaelementplayer.min.css?$version" );
$wpmediaelement = includes_url( "js/mediaelement/wp-mediaelement.css?$version" );
// WordPress default stylesheet and dashicons // WordPress default stylesheet and dashicons
$mce_css = array( $dashicons, self::$baseurl . '/skins/wordpress/wp-content.css' ); $mce_css = array(
$dashicons,
$mediaelement,
$wpmediaelement,
self::$baseurl . '/skins/wordpress/wp-content.css'
);
// load editor_style.css if the current theme supports it // load editor_style.css if the current theme supports it
if ( ! empty( $GLOBALS['editor_styles'] ) && is_array( $GLOBALS['editor_styles'] ) ) { if ( ! empty( $GLOBALS['editor_styles'] ) && is_array( $GLOBALS['editor_styles'] ) ) {

2
src/wp-includes/js/mediaelement/wp-mediaelement.css
View File

@ -1,5 +1,5 @@
.mejs-container, .mejs-embed, .mejs-embed body { .mejs-container, .mejs-embed, .mejs-embed body {
background: #464646; background: #000;
} }
.mejs-controls .mejs-time-rail .mejs-time-loaded { .mejs-controls .mejs-time-rail .mejs-time-loaded {

7
src/wp-includes/js/tinymce/skins/wordpress/wp-content.css
View File

@ -203,6 +203,13 @@ img::selection {
outline: 0; outline: 0;
} }
audio,
video,
embed {
display: -moz-inline-stack;
display: inline-block;
max-width: 100%;
}
/** /**
* WP Views * WP Views