Changeset 38160

Timestamp:

07/27/2016 02:58:27 AM (9 years ago)

Author:

azaozz

Message:

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

Fixes #37481.

File:

• trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (modified) (2 diffs)

trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -769 +769 @@
                     toolbar = this.getEl(),
                     toolbarWidth = toolbar.offsetWidth,
-                    toolbarHeight = toolbar.offsetHeight,
+                    toolbarHeight = toolbar.clientHeight,
                     selection = currentSelection.getBoundingClientRect(),
                     selectionMiddle = ( selection.left + selection.right ) / 2,
                     buffer = 5,
-                    margin = 8,
-                    spaceNeeded = toolbarHeight + margin + buffer,
+                    spaceNeeded = toolbarHeight + buffer,
                     wpAdminbarBottom = wpAdminbar ? wpAdminbar.getBoundingClientRect().bottom : 0,
                     mceToolbarBottom = mceToolbar ? mceToolbar.getBoundingClientRect().bottom : 0,
@@ -808 +807 @@
                     } else if ( spaceTop >= spaceNeeded ) {
                         className = ' mce-arrow-down';
-                        top = selection.top + iframeRect.top + scrollY - toolbarHeight - margin + iosOffsetTop;
+                        top = selection.top + iframeRect.top + scrollY - toolbarHeight + iosOffsetTop;
                     }
                 } else {
                     if ( spaceTop >= spaceNeeded ) {
                         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 ) {
                         className = ' mce-arrow-up';