Changeset 30641

Timestamp:

11/30/2014 06:36:59 AM (10 years ago)

Author:

azaozz

Message:

Editor: no pointer for DFW v2 when editor-scrolling is not used. Pass $post_type in the wp_editor_expand filter. See #30458.

Location:

trunk/src/wp-admin

Files:

• edit-form-advanced.php (modified) (1 diff)
• includes/template.php (modified) (1 diff)

trunk/src/wp-admin/edit-form-advanced.php

@@ -20 +20 @@
  *
  * @param bool $expand Whether to enable the 'expand' functionality. Default true.
+ * @param string $post_type Post type.
  */
 if ( post_type_supports( $post_type, 'editor' ) && ! wp_is_mobile() &&
      ! ( $is_IE && preg_match( '/MSIE [5678]/', $_SERVER['HTTP_USER_AGENT'] ) ) &&
-     apply_filters( 'wp_editor_expand', true ) ) {
+     apply_filters( 'wp_editor_expand', true, $post_type ) ) {
 
     wp_enqueue_script('editor-expand');

trunk/src/wp-admin/includes/template.php

@@ -2043 +2043 @@
 
     public static function pointer_wp410_dfw() {
+        // Don't show when editor-scrolling is not used.
+        if ( empty( $GLOBALS['_content_editor_dfw'] ) ) {
+            return;
+        }
+
         $content  = '<h3>' . __( 'Distraction Free Writing' ) . '</h3>';
         $content .= '<p>' . __( 'Enable distraction free writing; everything fades away so you can focus. '