Changeset 33592

Timestamp:

08/06/2015 09:34:16 PM (11 years ago)

Author:

iseulde

Message:

TinyMCE: fix inline toolbar repositioning for inline editors

Fixes #33286.

File:

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

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

@@ -558 +558 @@
             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' ) {
@@ -703 +709 @@
                     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,