WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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


git-svn-id: http://core.svn.wordpress.org/trunk@30631 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-11-30 06:37:21 +00:00
parent 4718bf4f76
commit 760e3e5fbd
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/edit-form-advanced.php
View File

@ -19,10 +19,11 @@ $_wp_editor_expand = $_content_editor_dfw = false;
* @since 4.0.0 * @since 4.0.0
* *
* @param bool $expand Whether to enable the 'expand' functionality. Default true. * @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() && if ( post_type_supports( $post_type, 'editor' ) && ! wp_is_mobile() &&
! ( $is_IE && preg_match( '/MSIE [5678]/', $_SERVER['HTTP_USER_AGENT'] ) ) && ! ( $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'); wp_enqueue_script('editor-expand');
$_content_editor_dfw = true; $_content_editor_dfw = true;

5
wp-admin/includes/template.php
View File

@ -2042,6 +2042,11 @@ final class WP_Internal_Pointers {
} }
public static function pointer_wp410_dfw() { 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 = '<h3>' . __( 'Distraction Free Writing' ) . '</h3>';
$content .= '<p>' . __( 'Enable distraction free writing; everything fades away so you can focus. ' $content .= '<p>' . __( 'Enable distraction free writing; everything fades away so you can focus. '
. 'Bring your admin back by moving your mouse, then start typing and it fades away.' ) . '</p>'; . 'Bring your admin back by moving your mouse, then start typing and it fades away.' ) . '</p>';

2
wp-includes/version.php
View File

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