Changeset 27534

Timestamp:

03/14/2014 12:33:24 PM (10 years ago)

Author:

wonderboymusic

Message:

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.

Location:

trunk/src/wp-includes

Files:

• class-wp-editor.php (modified) (1 diff)
• js/mediaelement/wp-mediaelement.css (modified) (1 diff)
• js/tinymce/skins/wordpress/wp-content.css (modified) (1 diff)

trunk/src/wp-includes/class-wp-editor.php

@@ -344 +344 @@
                 $version = 'ver=' . $GLOBALS['wp_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
-                $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

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

@@ -1 +1 @@
 .mejs-container, .mejs-embed, .mejs-embed body {
-    background: #464646;
+    background: #000;
 }
 

trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css

@@ -204 +204 @@
 }
 
+audio,
+video,
+embed {
+    display: -moz-inline-stack;
+    display: inline-block;
+    max-width: 100%;
+}
 
 /**