Changeset 45172

Timestamp:

04/12/2019 06:07:47 PM (3 years ago)

Author:

azaozz

Message:

TinyMCE: Fix keyboard navigation when the dfw button is present but hidden. Ensure that button is added last in the DOM to match where it appears visually.

Props afercia, azaozz.
Fixes #46640.

Location:

trunk/src

Files:

• js/_enqueues/wp/editor/dfw.js (modified) (1 diff)
• wp-admin/css/edit.css (modified) (1 diff)
• wp-includes/class-wp-editor.php (modified) (1 diff)
• wp-includes/css/editor.css (modified) (1 diff)

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

@@ -1474 +1474 @@
                     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() {

trunk/src/wp-admin/css/edit.css

@@ -1274 +1274 @@
 -------------------------------------------------------------- */
 
-#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;

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

@@ -588 +588 @@
                 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';
 
                 /**

trunk/src/wp-includes/css/editor.css

@@ -1270 +1270 @@
     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;
 }