Ticket #46640: 46640.3.diff

src/js/_enqueues/wp/editor/dfw.js

@@ -1473 +1473 @@
                                 onPostRender: function() {
                                         var button = this;
 
+                                        editor.on( 'init', function() {
+                                                if ( button.disabled() ) {
+                                                        button.hide();
+                                                }
+                                        } );
+
                                         $document
                                         .on( 'dfw-activate.focus', function() {
                                                 button.disabled( false );
+                                                button.show();
                                         } )
                                         .on( 'dfw-deactivate.focus', function() {
                                                 button.disabled( true );
+                                                button.hide();
                                         } )
                                         .on( 'dfw-on.focus', function() {
                                                 button.active( true );

src/wp-admin/css/edit.css

@@ -1273 +1273 @@
 /* DFW 2
 -------------------------------------------------------------- */
 
-#wp-content-wrap .mce-wp-dfw,
 #qt_content_dfw {
         display: none;
 }
 
-.wp-editor-expand #wp-content-wrap .mce-wp-dfw,
 .wp-editor-expand #qt_content_dfw {
         display: inline-block;
 }

src/wp-includes/class-wp-editor.php

@@ -587 +587 @@
 
                                 if ( ! wp_is_mobile() ) {
                                         if ( $set['_content_editor_dfw'] ) {
+                                                $mce_buttons[] = 'wp_adv';
                                                 $mce_buttons[] = 'dfw';
                                         } else {
                                                 $mce_buttons[] = 'fullscreen';
+                                                $mce_buttons[] = 'wp_adv';
                                         }
+                                } else {
+                                        $mce_buttons[] = 'wp_adv';
                                 }
 
-                                $mce_buttons[] = 'wp_adv';
-
                                 /**
                                  * Filters the first-row list of TinyMCE buttons (Visual tab).
                                  *

src/wp-includes/css/editor.css

@@ -1269 +1269 @@
         position: absolute;
         top: 0;
         right: 0;
+}
+
+.mce-toolbar .mce-btn-group .mce-btn.mce-wp-dfw {
+        margin: 7px 7px 0 0;
+}
+
+.qt-dfw {
         margin: 5px 5px 0 0;
 }