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

TinyMCE: fix the calculation for the inline toolbar vertical position.

Browse Source 
Fixes #37481.

git-svn-id: https://develop.svn.wordpress.org/trunk@38160 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2016-07-27 02:58:27 +00:00
parent d16d808d8b
commit e8c58c47db
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -768,12 +768,11 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
}, },
toolbar = this.getEl(), toolbar = this.getEl(),
toolbarWidth = toolbar.offsetWidth, toolbarWidth = toolbar.offsetWidth,
toolbarHeight = toolbar.offsetHeight, toolbarHeight = toolbar.clientHeight,
selection = currentSelection.getBoundingClientRect(), selection = currentSelection.getBoundingClientRect(),
selectionMiddle = ( selection.left + selection.right ) / 2, selectionMiddle = ( selection.left + selection.right ) / 2,
buffer = 5, buffer = 5,
margin = 8, spaceNeeded = toolbarHeight + buffer,
spaceNeeded = toolbarHeight + margin + buffer,
wpAdminbarBottom = wpAdminbar ? wpAdminbar.getBoundingClientRect().bottom : 0, wpAdminbarBottom = wpAdminbar ? wpAdminbar.getBoundingClientRect().bottom : 0,
mceToolbarBottom = mceToolbar ? mceToolbar.getBoundingClientRect().bottom : 0, mceToolbarBottom = mceToolbar ? mceToolbar.getBoundingClientRect().bottom : 0,
mceStatusbarTop = mceStatusbar ? windowHeight - mceStatusbar.getBoundingClientRect().top : 0, mceStatusbarTop = mceStatusbar ? windowHeight - mceStatusbar.getBoundingClientRect().top : 0,
@ -807,12 +806,12 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
top = selection.bottom + iframeRect.top + scrollY - iosOffsetBottom; top = selection.bottom + iframeRect.top + scrollY - iosOffsetBottom;
} else if ( spaceTop >= spaceNeeded ) { } else if ( spaceTop >= spaceNeeded ) {
className = ' mce-arrow-down'; className = ' mce-arrow-down';
top = selection.top + iframeRect.top + scrollY - toolbarHeight - margin + iosOffsetTop; top = selection.top + iframeRect.top + scrollY - toolbarHeight + iosOffsetTop;
} }
} else { } else {
if ( spaceTop >= spaceNeeded ) { if ( spaceTop >= spaceNeeded ) {
className = ' mce-arrow-down'; className = ' mce-arrow-down';
top = selection.top + iframeRect.top + scrollY - toolbarHeight - margin + iosOffsetTop; top = selection.top + iframeRect.top + scrollY - toolbarHeight + iosOffsetTop;
} else if ( spaceBottom >= spaceNeeded && editorHeight / 2 > selection.bottom + iframeRect.top - blockedTop ) { } else if ( spaceBottom >= spaceNeeded && editorHeight / 2 > selection.bottom + iframeRect.top - blockedTop ) {
className = ' mce-arrow-up'; className = ' mce-arrow-up';
top = selection.bottom + iframeRect.top + scrollY - iosOffsetBottom; top = selection.bottom + iframeRect.top + scrollY - iosOffsetBottom;