mirror of
https://github.com/WordPress/WordPress.git
synced 2024-09-26 22:32:52 +02:00
TinyMCE wpView: resize sandbox iframes on load. Fixes a problem with resizing after all images are loaded.
Props iseulde, mattheu. Fixes #31480. Built from https://develop.svn.wordpress.org/trunk@32056 git-svn-id: http://core.svn.wordpress.org/trunk@32035 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
42028327a2
commit
541573b378
@ -489,8 +489,7 @@ window.wp = window.wp || {};
|
|||||||
var dom = editor.dom,
|
var dom = editor.dom,
|
||||||
styles = '',
|
styles = '',
|
||||||
bodyClasses = editor.getBody().className || '',
|
bodyClasses = editor.getBody().className || '',
|
||||||
editorHead = editor.getDoc().getElementsByTagName( 'head' )[0],
|
editorHead = editor.getDoc().getElementsByTagName( 'head' )[0];
|
||||||
iframe, iframeDoc, observer, i;
|
|
||||||
|
|
||||||
tinymce.each( dom.$( 'link[rel="stylesheet"]', editorHead ), function( link ) {
|
tinymce.each( dom.$( 'link[rel="stylesheet"]', editorHead ), function( link ) {
|
||||||
if ( link.href && link.href.indexOf( 'skins/lightgray/content.min.css' ) === -1 &&
|
if ( link.href && link.href.indexOf( 'skins/lightgray/content.min.css' ) === -1 &&
|
||||||
@ -503,6 +502,8 @@ window.wp = window.wp || {};
|
|||||||
// Seems the browsers need a bit of time to insert/set the view nodes,
|
// Seems the browsers need a bit of time to insert/set the view nodes,
|
||||||
// or the iframe will fail especially when switching Text => Visual.
|
// or the iframe will fail especially when switching Text => Visual.
|
||||||
setTimeout( function() {
|
setTimeout( function() {
|
||||||
|
var iframe, iframeDoc, observer, i;
|
||||||
|
|
||||||
content.innerHTML = '';
|
content.innerHTML = '';
|
||||||
|
|
||||||
iframe = dom.add( content, 'iframe', {
|
iframe = dom.add( content, 'iframe', {
|
||||||
@ -572,6 +573,8 @@ window.wp = window.wp || {};
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$( iframe.contentWindow ).on( 'load', resize );
|
||||||
|
|
||||||
if ( MutationObserver ) {
|
if ( MutationObserver ) {
|
||||||
observer = new MutationObserver( _.debounce( resize, 100 ) );
|
observer = new MutationObserver( _.debounce( resize, 100 ) );
|
||||||
|
|
||||||
|
2
wp-includes/js/mce-view.min.js
vendored
2
wp-includes/js/mce-view.min.js
vendored
File diff suppressed because one or more lines are too long
@ -4,7 +4,7 @@
|
|||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '4.2-beta4-32055';
|
$wp_version = '4.2-beta4-32056';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
Loading…
Reference in New Issue
Block a user