Ticket #30619: 30619.6.patch

src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

@@ -1 +1 @@
 /* global tinymce */
 tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
-        var floatingToolbar, serializer,
+        var toolbar, serializer,
                 each = tinymce.each,
                 iOS = tinymce.Env.iOS;
 
@@ -59 +59 @@
                 } );
         } );
 
+        editor.once( 'preinit', function() {
+                toolbar = editor.wp._createToolbar( [
+                        'wp_img_alignleft',
+                        'wp_img_aligncenter',
+                        'wp_img_alignright',
+                        'wp_img_alignnone',
+                        'wp_img_edit',
+                        'wp_img_remove'
+                ] );
+        } );
+
         editor.on( 'wptoolbar', function( event ) {
                 if ( event.element.nodeName === 'IMG' && ! isPlaceholder( event.element ) ) {
-                        event.toolbar = floatingToolbar;
+                        event.toolbar = toolbar;
                 }
         } );
 
@@ -77 +88 @@
                                         editor.nodeChanged();
                                 }, 200 );
                         } else {
-                                floatingToolbar.hide();
+                                toolbar.hide();
                         }
                 } );
         }
@@ -544 +555 @@
 
                 dom.addClass( editor.getBody(), captionClass );
 
-                if ( editor.wp._createToolbar ) {
-                        floatingToolbar = editor.wp._createToolbar( [
-                                'wp_img_alignleft',
-                                'wp_img_aligncenter',
-                                'wp_img_alignright',
-                                'wp_img_alignnone',
-                                'wp_img_edit',
-                                'wp_img_remove'
-                        ] );
-                }
-
                 // Add caption field to the default image dialog
                 editor.on( 'wpLoadImageForm', function( event ) {
                         if ( editor.getParam( 'wpeditimage_disable_captions' ) ) {
@@ -867 +867 @@
                         editor.nodeChanged();
                         event.preventDefault();
 
-                        if ( floatingToolbar ) {
-                                floatingToolbar.reposition();
+                        if ( toolbar ) {
+                                toolbar.reposition();
                         }
 
                         editor.fire( 'ExecCommand', {

src/wp-includes/js/tinymce/plugins/wpview/plugin.js

@@ -240 +240 @@
                         selection = editor.selection,
                         MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
 
-                toolbar = editor.wp._createToolbar( [
-                        'wp_view_edit',
-                        'wp_view_remove'
-                ] );
-
                 // When a view is selected, ensure content that is being pasted
                 // or inserted is added to a text node (instead of the view).
                 editor.on( 'BeforeSetContent', function() {
@@ -673 +668 @@
                 }
         } );
 
+        editor.once( 'preinit', function() {
+                toolbar = editor.wp._createToolbar( [
+                        'wp_view_edit',
+                        'wp_view_remove'
+                ] );
+        } );
+
         editor.on( 'wptoolbar', function( event ) {
                 if ( selected ) {
                         event.element = selected;