diff --git a/src/js/_enqueues/wp/editor/dfw.js b/src/js/_enqueues/wp/editor/dfw.js index 61788efe7f..030193a39f 100644 --- a/src/js/_enqueues/wp/editor/dfw.js +++ b/src/js/_enqueues/wp/editor/dfw.js @@ -1473,12 +1473,20 @@ 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 ); diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css index bc1ce3d0c3..ce62c069ab 100644 --- a/src/wp-admin/css/edit.css +++ b/src/wp-admin/css/edit.css @@ -1273,12 +1273,10 @@ table.links-table { /* 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; } diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php index c3cb7e7241..30f38a7d69 100644 --- a/src/wp-includes/class-wp-editor.php +++ b/src/wp-includes/class-wp-editor.php @@ -587,14 +587,16 @@ final class _WP_Editors { 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). * diff --git a/src/wp-includes/css/editor.css b/src/wp-includes/css/editor.css index e391cf2cd9..7a99f00e62 100644 --- a/src/wp-includes/css/editor.css +++ b/src/wp-includes/css/editor.css @@ -1269,6 +1269,13 @@ i.mce-i-wp_code:before { 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; }