diff --git a/src/wp-includes/js/mce-view.js b/src/wp-includes/js/mce-view.js
index ce35a14db3..ddf09f3e0a 100644
--- a/src/wp-includes/js/mce-view.js
+++ b/src/wp-includes/js/mce-view.js
@@ -156,8 +156,18 @@ window.wp = window.wp || {};
'' +
'' +
'' +
+ '' +
'' +
- '' +
+ '' +
html +
'' +
''
@@ -166,7 +176,7 @@ window.wp = window.wp || {};
resize = function() {
// Make sure the iframe still exists.
- iframe.contentWindow && $( iframe ).height( $( iframeDoc.body ).height() );
+ iframe.contentWindow && $( iframe ).height( $( iframeDoc.body ).outerHeight() );
};
if ( MutationObserver ) {
diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php
index 2a0c5c0bc1..3ac5ece8ca 100644
--- a/src/wp-includes/media.php
+++ b/src/wp-includes/media.php
@@ -3310,18 +3310,9 @@ function attachment_url_to_postid( $url ) {
*/
function wp_media_mce_styles() {
$version = 'ver=' . $GLOBALS['wp_version'];
- $tinymce = includes_url( "js/tinymce/skins/lightgray/content.min.css?$version" );
$dashicons = includes_url( "css/dashicons.css?$version" );
- $skin = includes_url( "js/tinymce/skins/wordpress/wp-content.css?$version" );
$mediaelement = includes_url( "js/mediaelement/mediaelementplayer.min.css?$version" );
$wpmediaelement = includes_url( "js/mediaelement/wp-mediaelement.css?$version" );
- $mce_styles = array( $tinymce, $dashicons, $skin, $mediaelement, $wpmediaelement );
- $editor_styles = get_editor_stylesheets();
- if ( ! empty( $editor_styles ) ) {
- foreach ( $editor_styles as $style ) {
- $mce_styles[] = $style;
- }
- }
- return $mce_styles;
-}
\ No newline at end of file
+ return array( $dashicons, $mediaelement, $wpmediaelement );
+}