From 994b1d9a5b338cd0463fd8ff12530e1e4500821d Mon Sep 17 00:00:00 2001 From: Ella Iseulde Van Dorpe Date: Thu, 6 Aug 2015 21:34:16 +0000 Subject: [PATCH] TinyMCE: fix inline toolbar repositioning for inline editors Fixes #33286. git-svn-id: https://develop.svn.wordpress.org/trunk@33592 602fd350-edb4-49c9-b593-d223f7449a82 --- .../js/tinymce/plugins/wordpress/plugin.js | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js index 9f6d7147fa..64a80c2684 100644 --- a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js @@ -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,