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

TinyMCE: fix inline toolbar repositioning for inline editors 

Fixes #33286.

Built from https://develop.svn.wordpress.org/trunk@33592


git-svn-id: http://core.svn.wordpress.org/trunk@33559 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ella Iseulde Van Dorpe 2015-08-06 21:35:25 +00:00
parent d60e2eea84
commit 718271dd53
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-includes/js/tinymce/plugins/wordpress/plugin.js
View File

@ -557,12 +557,18 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
activeToolbar,
currentSelection,
timeout,
container = editor.getContainer(),
wpAdminbar = document.getElementById( 'wpadminbar' ),
mceIframe = document.getElementById( editor.id + '_ifr' ),
mceToolbar = tinymce.$( '.mce-toolbar-grp', editor.getContainer() )[0],
mceStatusbar = tinymce.$( '.mce-statusbar', editor.getContainer() )[0],
mceToolbar,
mceStatusbar,
wpStatusbar;
if ( container ) {
mceToolbar = tinymce.$( '.mce-toolbar-grp', container )[0];
mceStatusbar = tinymce.$( '.mce-statusbar', container )[0];
}
if ( editor.id === 'content' ) {
wpStatusbar = document.getElementById( 'post-status-info' );
}
@ -702,7 +708,14 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
scrollY = window.pageYOffset || document.documentElement.scrollTop,
windowWidth = window.innerWidth,
windowHeight = window.innerHeight,
iframeRect = mceIframe.getBoundingClientRect(),
iframeRect = mceIframe ? mceIframe.getBoundingClientRect() : {
top: 0,
right: windowWidth,
bottom: windowHeight,
left: 0,
width: windowWidth,
height: windowHeight
},
toolbar = this.getEl(),
toolbarWidth = toolbar.offsetWidth,
toolbarHeight = toolbar.offsetHeight,

2
wp-includes/js/tinymce/plugins/wordpress/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.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-RC2-33591';
$wp_version = '4.3-RC2-33592';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.