Changeset 32818

Timestamp:

06/17/2015 07:07:50 AM (11 years ago)

Author:

iseulde

Message:

TinyMCE: show active inline toolbar after focus

This makes sure that e.g. the image toolbar shows up again after closing the media library modal.

See #32604.

File:

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

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

@@ -447 +447 @@
                 var Factory = tinymce.ui.Factory,
                         settings = editor.settings,
-                        currentToolbar,
+                        activeToolbar,
                         currentSelection,
                         wpAdminbar = document.getElementById( 'wpadminbar' ),
@@ -668 +668 @@
 
                         toolbar.on( 'show', function() {
-                                currentToolbar = this;
                                 this.reposition();
-                        } );
-
-                        toolbar.on( 'hide', function() {
-                                currentToolbar = false;
                         } );
 
@@ -704 +699 @@
                         var node;
 
-                        if ( currentToolbar ) {
-                                node = currentToolbar.find( 'toolbar' )[0];
+                        if ( activeToolbar ) {
+                                node = activeToolbar.find( 'toolbar' )[0];
                                 node && node.focus( true );
                         }
@@ -723 +718 @@
                         currentSelection = args.selection || args.element;
 
-                        currentToolbar && currentToolbar.hide();
-                        args.toolbar && args.toolbar.show();
+                        if ( activeToolbar ) {
+                                activeToolbar.hide();
+                        }
+
+                        if ( args.toolbar ) {
+                                activeToolbar = args.toolbar;
+                                activeToolbar.show();
+                        } else {
+                                activeToolbar = false;
+                        }
+                } );
+
+                editor.on( 'focus', function() {
+                        if ( activeToolbar ) {
+                                activeToolbar.show();
+                        }
+                } );
+
+                editor.on( 'hide', function() {
+                        activeToolbar = false;
                 } );