Editor: hide the DFW v2 button when editor-expand is off. Fixes #30568.

Built from https://develop.svn.wordpress.org/trunk@30711


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

wp-admin/css/edit-rtl.css

@@ -1244,6 +1244,16 @@ 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;
+}
+
 .focus-on .wrap > h2,
 .focus-on #wpfooter,
 .focus-on .postbox-container,

wp-admin/css/edit.css

@@ -1244,6 +1244,16 @@ 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;
+}
+
 .focus-on .wrap > h2,
 .focus-on #wpfooter,
 .focus-on .postbox-container,

wp-admin/includes/template.php

@@ -2044,7 +2044,7 @@ final class WP_Internal_Pointers {
 
 	public static function pointer_wp410_dfw() {
 		// Don't show when editor-scrolling is not used.
-		if ( empty( $GLOBALS['_content_editor_dfw'] ) ) {
+		if ( empty( $GLOBALS['_wp_editor_expand'] ) ) {
 			return;
 		}
 

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30710';
+$wp_version = '4.1-beta2-30711';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.