Changeset 29543
- Timestamp:
- 08/19/2014 09:52:19 PM (11 years ago)
- Location:
- trunk/src/wp-includes
- Files:
-
- 2 edited
-
js/mce-view.js (modified) (2 diffs)
-
media.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/js/mce-view.js
r29530 r29543 157 157 '<head>' + 158 158 '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />' + 159 '<style>' + 160 'html, body#wpview-iframe-sandbox {' + 161 'background: transparent;' + 162 'padding: 0;' + 163 'margin: 0;' + 164 '}' + 165 'body#wpview-iframe-sandbox {' + 166 'padding: 1px 0;' + 167 '}' + 168 '</style>' + 159 169 '</head>' + 160 '<body data-context="iframe-sandbox" style="padding: 0; margin: 0;" class="' + editor.getBody().className + '">' +170 '<body id="wpview-iframe-sandbox">' + 161 171 html + 162 172 '</body>' + … … 167 177 resize = function() { 168 178 // Make sure the iframe still exists. 169 iframe.contentWindow && $( iframe ).height( $( iframeDoc.body ). height() );179 iframe.contentWindow && $( iframe ).height( $( iframeDoc.body ).outerHeight() ); 170 180 }; 171 181 -
trunk/src/wp-includes/media.php
r29493 r29543 3311 3311 function wp_media_mce_styles() { 3312 3312 $version = 'ver=' . $GLOBALS['wp_version']; 3313 $tinymce = includes_url( "js/tinymce/skins/lightgray/content.min.css?$version" );3314 3313 $dashicons = includes_url( "css/dashicons.css?$version" ); 3315 $skin = includes_url( "js/tinymce/skins/wordpress/wp-content.css?$version" );3316 3314 $mediaelement = includes_url( "js/mediaelement/mediaelementplayer.min.css?$version" ); 3317 3315 $wpmediaelement = includes_url( "js/mediaelement/wp-mediaelement.css?$version" ); 3318 3316 3319 $mce_styles = array( $tinymce, $dashicons, $skin, $mediaelement, $wpmediaelement ); 3320 $editor_styles = get_editor_stylesheets(); 3321 if ( ! empty( $editor_styles ) ) { 3322 foreach ( $editor_styles as $style ) { 3323 $mce_styles[] = $style; 3324 } 3325 } 3326 return $mce_styles; 3327 } 3317 return array( $dashicons, $mediaelement, $wpmediaelement ); 3318 }
Note: See TracChangeset
for help on using the changeset viewer.