sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TinyMCE: fix inline toolbar repositioning for inline editors

Browse Source 
Fixes #33286.


git-svn-id: https://develop.svn.wordpress.org/trunk@33592 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ella Iseulde Van Dorpe 2015-08-06 21:34:16 +00:00
parent 7e4a72b9bc
commit 994b1d9a5b
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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