WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TinyMCE: select the iframe element by id. Needed as some browser extensions insert extra elements in the page. 

Props iseulde.
Merges [31180] to the 4.1 branch.
Fixes #30785.

Built from https://develop.svn.wordpress.org/branches/4.1@31436


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31417 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2015-02-12 06:00:23 +00:00
parent 0c28c25442
commit 1c36669bce
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
View File

@ -185,7 +185,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
windowWidth = window.innerWidth; windowWidth = window.innerWidth;
toolbarWidth = toolbarNode.offsetWidth; toolbarWidth = toolbarNode.offsetWidth;
toolbarHalf = toolbarWidth / 2; toolbarHalf = toolbarWidth / 2;
iframe = editor.getContentAreaContainer().firstChild; iframe = document.getElementById( editor.id + '_ifr' );
iframePos = DOM.getPos( iframe ); iframePos = DOM.getPos( iframe );
iframeWidth = iframe.offsetWidth; iframeWidth = iframe.offsetWidth;
iframeHeigth = iframe.offsetHeight; iframeHeigth = iframe.offsetHeight;

2
wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.