';
if ( $set['media_buttons'] ) {
self::$has_medialib = true;
- if ( !function_exists('media_buttons') )
- include(ABSPATH . 'wp-admin/includes/media.php');
+ if ( ! function_exists( 'media_buttons' ) )
+ include( ABSPATH . 'wp-admin/includes/media.php' );
- echo '
';
+ echo '
';
/**
* Fires after the default media button(s) are displayed.
@@ -224,6 +227,18 @@ final class _WP_Editors {
echo "
\n";
}
+ $quicktags_toolbar = '';
+
+ if ( self::$this_quicktags ) {
+ if ( 'content' === $editor_id && ! empty( $GLOBALS['current_screen'] ) && $GLOBALS['current_screen']->base === 'post' ) {
+ $toolbar_id = 'ed_toolbar';
+ } else {
+ $toolbar_id = 'qt_' . $editor_id_attr . '_toolbar';
+ }
+
+ $quicktags_toolbar = '
';
+ }
+
/**
* Filter the HTML markup output that displays the editor.
*
@@ -231,9 +246,15 @@ final class _WP_Editors {
*
* @param string $output Editor's HTML markup.
*/
- $the_editor = apply_filters( 'the_editor', '
' .
- '
' );
+ $the_editor = apply_filters( 'the_editor', '
' .
+ $quicktags_toolbar .
+ '
' );
+
+ // Prepare the content for the Visual or Text editor
+ if ( self::$this_tinymce ) {
+ add_filter( 'the_editor_content', 'format_for_editor', 10, 2 );
+ }
/**
* Filter the default editor content.
@@ -242,19 +263,40 @@ final class _WP_Editors {
*
* @param string $content Default editor content.
*/
- $content = apply_filters( 'the_editor_content', $content );
+ $content = apply_filters( 'the_editor_content', $content, $default_editor );
+
+ // Back-compat for the `htmledit_pre` and `richedit_pre` filters
+ if ( 'html' === $default_editor && has_filter( 'htmledit_pre' ) ) {
+ // TODO: needs _deprecated_filter(), use _deprecated_function() as substitute for now
+ _deprecated_function( 'add_filter( htmledit_pre )', '4.3.0', 'add_filter( format_for_editor )' );
+ $content = apply_filters( 'htmledit_pre', $content );
+ } elseif ( 'tinymce' === $default_editor && has_filter( 'richedit_pre' ) ) {
+ _deprecated_function( 'add_filter( richedit_pre )', '4.3.0', 'add_filter( format_for_editor )' );
+ $content = apply_filters( 'richedit_pre', $content );
+ }
+
+ if ( false !== stripos( $content, 'textarea' ) ) {
+ $content = preg_replace( '%\n\n";
- self::editor_settings($editor_id, $set);
+ self::editor_settings( $editor_id, $set );
}
/**
+ * @static
+ *
+ * @global string $wp_version
+ * @global string $tinymce_version
+ *
* @param string $editor_id
* @param array $set
*/
public static function editor_settings($editor_id, $set) {
+ global $wp_version, $tinymce_version;
+
$first_run = false;
if ( empty(self::$first_init) ) {
@@ -280,9 +322,6 @@ final class _WP_Editors {
if ( empty($qtInit['buttons']) )
$qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
- if ( $set['dfw'] )
- $qtInit['buttons'] .= ',fullscreen';
-
if ( $set['_content_editor_dfw'] ) {
$qtInit['buttons'] .= ',dfw';
}
@@ -360,10 +399,12 @@ final class _WP_Editors {
'wordpress',
'wpautoresize',
'wpeditimage',
+ 'wpemoji',
'wpgallery',
'wplink',
'wpdialogs',
- 'wpview',
+ 'wptextpattern',
+ 'wpview'
);
if ( ! self::$has_medialib ) {
@@ -465,9 +506,6 @@ final class _WP_Editors {
}
}
- if ( $set['dfw'] )
- $plugins[] = 'wpfullscreen';
-
self::$plugins = $plugins;
self::$ext_plugins = $ext_plugins;
@@ -475,30 +513,21 @@ final class _WP_Editors {
'theme' => 'modern',
'skin' => 'lightgray',
'language' => self::$mce_locale,
- 'formats' => "{
- alignleft: [
- {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'left'}},
- {selector: 'img,table,dl.wp-caption', classes: 'alignleft'}
- ],
- aligncenter: [
- {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'center'}},
- {selector: 'img,table,dl.wp-caption', classes: 'aligncenter'}
- ],
- alignright: [
- {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'right'}},
- {selector: 'img,table,dl.wp-caption', classes: 'alignright'}
- ],
- strikethrough: {inline: 'del'}
- }",
- 'block_formats' =>
- 'Paragraph=p;' .
- 'Pre=pre;' .
- 'Heading 1=h1;' .
- 'Heading 2=h2;' .
- 'Heading 3=h3;' .
- 'Heading 4=h4;' .
- 'Heading 5=h5;' .
- 'Heading 6=h6',
+ 'formats' => '{' .
+ 'alignleft: [' .
+ '{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"left"}},' .
+ '{selector: "img,table,dl.wp-caption", classes: "alignleft"}' .
+ '],' .
+ 'aligncenter: [' .
+ '{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"center"}},' .
+ '{selector: "img,table,dl.wp-caption", classes: "aligncenter"}' .
+ '],' .
+ 'alignright: [' .
+ '{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"right"}},' .
+ '{selector: "img,table,dl.wp-caption", classes: "alignright"}' .
+ '],' .
+ 'strikethrough: {inline: "del"}' .
+ '}',
'relative_urls' => false,
'remove_script_host' => false,
'convert_urls' => false,
@@ -507,11 +536,12 @@ final class _WP_Editors {
'entities' => '38,amp,60,lt,62,gt',
'entity_encoding' => 'raw',
'keep_styles' => false,
- 'cache_suffix' => 'wp-mce-' . $GLOBALS['tinymce_version'],
+ 'cache_suffix' => 'wp-mce-' . $tinymce_version,
// Limit the preview styles in the menu/toolbar
'preview_styles' => 'font-family font-size font-weight font-style text-decoration text-transform',
+ 'end_container_on_empty_block' => true,
'wpeditimage_disable_captions' => $no_captions,
'wpeditimage_html5_captions' => current_theme_supports( 'html5', 'caption' ),
'plugins' => implode( ',', $plugins ),
@@ -521,8 +551,8 @@ final class _WP_Editors {
self::$first_init['external_plugins'] = wp_json_encode( $mce_external_plugins );
}
- $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
- $version = 'ver=' . $GLOBALS['wp_version'];
+ $suffix = SCRIPT_DEBUG ? '' : '.min';
+ $version = 'ver=' . $wp_version;
$dashicons = includes_url( "css/dashicons$suffix.css?$version" );
// WordPress default stylesheet and dashicons
@@ -584,6 +614,12 @@ final class _WP_Editors {
*/
$mce_buttons = apply_filters( 'mce_buttons', $mce_buttons, $editor_id );
+ $mce_buttons_2 = array( 'formatselect', 'underline', 'alignjustify', 'forecolor', 'pastetext', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo' );
+
+ if ( ! wp_is_mobile() ) {
+ $mce_buttons_2[] = 'wp_help';
+ }
+
/**
* Filter the second-row list of TinyMCE buttons (Visual tab).
*
@@ -592,7 +628,7 @@ final class _WP_Editors {
* @param array $buttons Second-row list of buttons.
* @param string $editor_id Unique editor identifier, e.g. 'content'.
*/
- $mce_buttons_2 = apply_filters( 'mce_buttons_2', array( 'formatselect', 'underline', 'alignjustify', 'forecolor', 'pastetext', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo', 'wp_help' ), $editor_id );
+ $mce_buttons_2 = apply_filters( 'mce_buttons_2', $mce_buttons_2, $editor_id );
/**
* Filter the third-row list of TinyMCE buttons (Visual tab).
@@ -635,18 +671,6 @@ final class _WP_Editors {
unset($set['tinymce']['body_class']);
}
- if ( $set['dfw'] ) {
- // replace the first 'fullscreen' with 'wp_fullscreen'
- if ( ($key = array_search('fullscreen', $mce_buttons)) !== false )
- $mce_buttons[$key] = 'wp_fullscreen';
- elseif ( ($key = array_search('fullscreen', $mce_buttons_2)) !== false )
- $mce_buttons_2[$key] = 'wp_fullscreen';
- elseif ( ($key = array_search('fullscreen', $mce_buttons_3)) !== false )
- $mce_buttons_3[$key] = 'wp_fullscreen';
- elseif ( ($key = array_search('fullscreen', $mce_buttons_4)) !== false )
- $mce_buttons_4[$key] = 'wp_fullscreen';
- }
-
$mceInit = array (
'selector' => "#$editor_id",
'resize' => 'vertical',
@@ -661,8 +685,8 @@ final class _WP_Editors {
'body_class' => $body_class
);
- if ( $first_run )
- $mceInit = array_merge( self::$first_init, $mceInit );
+ // Merge with the first part of the init array
+ $mceInit = array_merge( self::$first_init, $mceInit );
if ( is_array( $set['tinymce'] ) )
$mceInit = array_merge( $mceInit, $set['tinymce'] );
@@ -673,7 +697,7 @@ final class _WP_Editors {
* before tinyMCE.init. Setting "valid_elements", "invalid_elements"
* and "extended_valid_elements" can be done through this filter. Best
* is to use the default cleanup by not specifying valid_elements,
- * as TinyMCE contains full set of XHTML 1.0.
+ * as TinyMCE checks against the full set of HTML 5.0 elements and attributes.
*/
if ( $set['teeny'] ) {
@@ -708,6 +732,12 @@ final class _WP_Editors {
} // end if self::$this_tinymce
}
+ /**
+ *
+ * @static
+ * @param array $init
+ * @return string
+ */
private static function _parse_init($init) {
$options = '';
@@ -726,9 +756,11 @@ final class _WP_Editors {
return '{' . trim( $options, ' ,' ) . '}';
}
+ /**
+ *
+ * @static
+ */
public static function enqueue_scripts() {
- wp_enqueue_script('word-count');
-
if ( self::$has_tinymce )
wp_enqueue_script('editor');
@@ -741,8 +773,9 @@ final class _WP_Editors {
wp_enqueue_script('wplink');
}
- if ( in_array('wpfullscreen', self::$plugins, true) || in_array('fullscreen', self::$qt_buttons, true) )
- wp_enqueue_script('wp-fullscreen');
+ if ( self::$old_dfw_compat ) {
+ wp_enqueue_script('wp-fullscreen-stub');
+ }
if ( self::$has_medialib ) {
add_thickbox();
@@ -767,6 +800,7 @@ final class _WP_Editors {
* Translates the default TinyMCE strings and returns them as JSON encoded object ready to be loaded with tinymce.addI18n().
* Can be used directly (_WP_Editors::wp_mce_translation()) by passing the same locale as set in the TinyMCE init object.
*
+ * @static
* @param string $mce_locale The locale used for the editor.
* @param bool $json_only optional Whether to include the JavaScript calls to tinymce.addI18n() and tinymce.ScriptLoader.markDone().
* @return string Translation object, JSON encoded.
@@ -792,6 +826,7 @@ final class _WP_Editors {
'Blockquote' => __( 'Blockquote' ),
'Div' => _x( 'Div', 'HTML tag' ),
'Pre' => _x( 'Pre', 'HTML tag' ),
+ 'Preformatted' => _x( 'Preformatted', 'HTML tag' ),
'Address' => _x( 'Address', 'HTML tag' ),
'Inline' => _x( 'Inline', 'HTML elements' ),
@@ -991,14 +1026,36 @@ final class _WP_Editors {
'Format' => _x( 'Format', 'TinyMCE menu' ),
// WordPress strings
- 'Keyboard Shortcuts' => __( 'Keyboard Shortcuts' ),
'Toolbar Toggle' => __( 'Toolbar Toggle' ),
'Insert Read More tag' => __( 'Insert Read More tag' ),
+ 'Insert Page Break tag' => __( 'Insert Page Break tag' ),
'Read more...' => __( 'Read more...' ), // Title on the placeholder inside the editor
'Distraction-free writing mode' => __( 'Distraction-free writing mode' ),
'No alignment' => __( 'No alignment' ), // Tooltip for the 'alignnone' button in the image toolbar
'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar
'Edit ' => __( 'Edit' ), // Tooltip for the 'edit' button in the image toolbar
+
+ // Shortcuts help modal
+ 'Keyboard Shortcuts' => __( 'Keyboard Shortcuts' ),
+ 'Default shortcuts,' => __( 'Default shortcuts,' ),
+ 'Additional shortcuts,' => __( 'Additional shortcuts,' ),
+ 'Focus shortcuts:' => __( 'Focus shortcuts:' ),
+ 'Inline toolbar (when an image, link or preview is selected)' => __( 'Inline toolbar (when an image, link or preview is selected)' ),
+ 'Editor menu (when enabled)' => __( 'Editor menu (when enabled)' ),
+ 'Editor toolbar' => __( 'Editor toolbar' ),
+ 'Elements path' => __( 'Elements path' ),
+ 'Ctrl + Alt + letter:' => __( 'Ctrl + Alt + letter:' ),
+ 'Shift + Alt + letter:' => __( 'Shift + Alt + letter:' ),
+ 'Cmd + letter:' => __( 'Cmd + letter:' ),
+ 'Ctrl + letter:' => __( 'Ctrl + letter:' ),
+ 'Letter' => __( 'Letter' ),
+ 'Action' => __( 'Action' ),
+ 'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' =>
+ __( 'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' ),
+ 'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' =>
+ __( 'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ),
+ 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' =>
+ __( 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' ),
);
/**
@@ -1053,8 +1110,16 @@ final class _WP_Editors {
"tinymce.ScriptLoader.markDone( '$baseurl/langs/$mce_locale.js' );\n";
}
+ /**
+ *
+ * @static
+ * @global string $wp_version
+ * @global string $tinymce_version
+ * @global bool $concatenate_scripts
+ * @global bool $compress_scripts
+ */
public static function editor_js() {
- global $tinymce_version, $concatenate_scripts, $compress_scripts;
+ global $wp_version, $tinymce_version, $concatenate_scripts, $compress_scripts;
/**
* Filter "tiny_mce_version" is deprecated
@@ -1099,7 +1164,7 @@ final class _WP_Editors {
'language' => self::$mce_locale
);
- $suffix = ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) ? '' : '.min';
+ $suffix = SCRIPT_DEBUG ? '' : '.min';
/**
* Fires immediately before the TinyMCE settings are printed.
@@ -1132,7 +1197,7 @@ final class _WP_Editors {
$baseurl = self::$baseurl;
// Load tinymce.js when running from /src, else load wp-tinymce.js.gz (production) or tinymce.min.js (SCRIPT_DEBUG)
- $mce_suffix = false !== strpos( $GLOBALS['wp_version'], '-src' ) ? '' : '.min';
+ $mce_suffix = false !== strpos( $wp_version, '-src' ) ? '' : '.min';
if ( $tmce_on ) {
if ( $compressed ) {
@@ -1173,54 +1238,29 @@ final class _WP_Editors {
?>
( function() {
- var init, edId, qtId, firstInit, wrapper;
+ var init, id, $wrap;
if ( typeof tinymce !== 'undefined' ) {
- for ( edId in tinyMCEPreInit.mceInit ) {
- if ( firstInit ) {
- init = tinyMCEPreInit.mceInit[edId] = tinymce.extend( {}, firstInit, tinyMCEPreInit.mceInit[edId] );
- } else {
- init = firstInit = tinyMCEPreInit.mceInit[edId];
- }
+ for ( id in tinyMCEPreInit.mceInit ) {
+ init = tinyMCEPreInit.mceInit[id];
+ $wrap = tinymce.$( '#wp-' + id + '-wrap' );
- wrapper = tinymce.DOM.select( '#wp-' + edId + '-wrap' )[0];
+ if ( ( $wrap.hasClass( 'tmce-active' ) || ! tinyMCEPreInit.qtInit.hasOwnProperty( id ) ) && ! init.wp_skip_init ) {
+ tinymce.init( init );
- if ( ( tinymce.DOM.hasClass( wrapper, 'tmce-active' ) || ! tinyMCEPreInit.qtInit.hasOwnProperty( edId ) ) &&
- ! init.wp_skip_init ) {
-
- try {
- tinymce.init( init );
-
- if ( ! window.wpActiveEditor ) {
- window.wpActiveEditor = edId;
- }
- } catch(e){}
+ if ( ! window.wpActiveEditor ) {
+ window.wpActiveEditor = id;
+ }
}
}
}
if ( typeof quicktags !== 'undefined' ) {
- for ( qtId in tinyMCEPreInit.qtInit ) {
- try {
- quicktags( tinyMCEPreInit.qtInit[qtId] );
+ for ( id in tinyMCEPreInit.qtInit ) {
+ quicktags( tinyMCEPreInit.qtInit[id] );
- if ( ! window.wpActiveEditor ) {
- window.wpActiveEditor = qtId;
- }
- } catch(e){};
- }
- }
-
- if ( typeof jQuery !== 'undefined' ) {
- jQuery('.wp-editor-wrap').on( 'click.wp-editor', function() {
- if ( this.id ) {
- window.wpActiveEditor = this.id.slice( 3, -5 );
- }
- });
- } else {
- for ( qtId in tinyMCEPreInit.qtInit ) {
- document.getElementById( 'wp-' + qtId + '-wrap' ).onclick = function() {
- window.wpActiveEditor = this.id.slice( 3, -5 );
+ if ( ! window.wpActiveEditor ) {
+ window.wpActiveEditor = id;
}
}
}
@@ -1231,9 +1271,6 @@ final class _WP_Editors {
if ( in_array( 'wplink', self::$plugins, true ) || in_array( 'link', self::$qt_buttons, true ) )
self::wp_link_dialog();
- if ( in_array( 'wpfullscreen', self::$plugins, true ) || in_array( 'fullscreen', self::$qt_buttons, true ) )
- self::wp_fullscreen_html();
-
/**
* Fires after any core TinyMCE editor instances are created.
*
@@ -1244,97 +1281,13 @@ final class _WP_Editors {
do_action( 'after_wp_tiny_mce', self::$mce_settings );
}
+ /**
+ *
+ * @static
+ * @global int $content_width
+ */
public static function wp_fullscreen_html() {
- global $content_width;
- $post = get_post();
-
- $width = isset( $content_width ) && 800 > $content_width ? $content_width : 800;
- $width = $width + 22; // compensate for the padding and border
- $dfw_width = get_user_setting( 'dfw_width', $width );
- $save = isset( $post->post_status ) && $post->post_status == 'publish' ? __('Update') : __('Save');
-
- ?>
-
-
-
-
-
-
+
-
@@ -1462,7 +1418,7 @@ final class _WP_Editors {