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.
Built from https://develop.svn.wordpress.org/trunk@45172


git-svn-id: http://core.svn.wordpress.org/trunk@44981 1a063a9b-81f0-0310-95a4-ce76da25c4cd

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).
 				 *

wp-includes/css/editor-rtl.css

@@ -1269,6 +1269,13 @@ i.mce-i-wp_code:before {
 	position: absolute;
 	top: 0;
 	left: 0;
+}
+
+.mce-toolbar .mce-btn-group .mce-btn.mce-wp-dfw {
+	margin: 7px 0 0 7px;
+}
+
+.qt-dfw {
 	margin: 5px 0 0 5px;
 }
 

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;
 }
 

wp-includes/version.php

@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.2-beta2-45171';
+$wp_version = '5.2-beta2-45172';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.