}
+ */
+ component.widgetControls = {};
+
+ /**
+ * Handle widget being added or initialized for the first time at the widget-added event.
+ *
+ * @param {jQuery.Event} event - Event.
+ * @param {jQuery} widgetContainer - Widget container element.
+ * @returns {void}
+ */
+ component.handleWidgetAdded = function handleWidgetAdded( event, widgetContainer ) {
+ var widgetForm, idBase, widgetControl, widgetId, animatedCheckDelay = 50, widgetInside, renderWhenAnimationDone;
+ widgetForm = widgetContainer.find( '> .widget-inside > .form, > .widget-inside > form' ); // Note: '.form' appears in the customizer, whereas 'form' on the widgets admin screen.
+
+ idBase = widgetForm.find( '> .id_base' ).val();
+ if ( 'text' !== idBase ) {
+ return;
+ }
+
+ // Prevent initializing already-added widgets.
+ widgetId = widgetForm.find( '> .widget-id' ).val();
+ if ( component.widgetControls[ widgetId ] ) {
+ return;
+ }
+
+ widgetControl = new component.TextWidgetControl({
+ el: widgetContainer
+ });
+
+ component.widgetControls[ widgetId ] = widgetControl;
+
+ /*
+ * Render the widget once the widget parent's container finishes animating,
+ * as the widget-added event fires with a slideDown of the container.
+ * This ensures that the textarea is visible and an iframe can be embedded
+ * with TinyMCE being able to set contenteditable on it.
+ */
+ widgetInside = widgetContainer.parent();
+ renderWhenAnimationDone = function() {
+ if ( widgetInside.is( ':animated' ) ) {
+ setTimeout( renderWhenAnimationDone, animatedCheckDelay );
+ } else {
+ widgetControl.initializeEditor();
+ }
+ };
+ renderWhenAnimationDone();
+ };
+
+ /**
+ * Sync widget instance data sanitized from server back onto widget model.
+ *
+ * This gets called via the 'widget-updated' event when saving a widget from
+ * the widgets admin screen and also via the 'widget-synced' event when making
+ * a change to a widget in the customizer.
+ *
+ * @param {jQuery.Event} event - Event.
+ * @param {jQuery} widgetContainer - Widget container element.
+ * @returns {void}
+ */
+ component.handleWidgetUpdated = function handleWidgetUpdated( event, widgetContainer ) {
+ var widgetForm, widgetId, widgetControl, idBase;
+ widgetForm = widgetContainer.find( '> .widget-inside > .form, > .widget-inside > form' );
+
+ idBase = widgetForm.find( '> .id_base' ).val();
+ if ( 'text' !== idBase ) {
+ return;
+ }
+
+ widgetId = widgetForm.find( '> .widget-id' ).val();
+ widgetControl = component.widgetControls[ widgetId ];
+ if ( ! widgetControl ) {
+ return;
+ }
+
+ widgetControl.updateFields();
+ };
+
+ /**
+ * Initialize functionality.
+ *
+ * This function exists to prevent the JS file from having to boot itself.
+ * When WordPress enqueues this script, it should have an inline script
+ * attached which calls wp.textWidgets.init().
+ *
+ * @returns {void}
+ */
+ component.init = function init() {
+ var $document = $( document );
+ $document.on( 'widget-added', component.handleWidgetAdded );
+ $document.on( 'widget-synced widget-updated', component.handleWidgetUpdated );
+
+ /*
+ * Manually trigger widget-added events for media widgets on the admin
+ * screen once they are expanded. The widget-added event is not triggered
+ * for each pre-existing widget on the widgets admin screen like it is
+ * on the customizer. Likewise, the customizer only triggers widget-added
+ * when the widget is expanded to just-in-time construct the widget form
+ * when it is actually going to be displayed. So the following implements
+ * the same for the widgets admin screen, to invoke the widget-added
+ * handler when a pre-existing media widget is expanded.
+ */
+ $( function initializeExistingWidgetContainers() {
+ var widgetContainers;
+ if ( 'widgets' !== window.pagenow ) {
+ return;
+ }
+ widgetContainers = $( '.widgets-holder-wrap:not(#available-widgets)' ).find( 'div.widget' );
+ widgetContainers.one( 'click.toggle-widget-expanded', function toggleWidgetExpanded() {
+ var widgetContainer = $( this );
+ component.handleWidgetAdded( new jQuery.Event( 'widget-added' ), widgetContainer );
+ });
+ });
+ };
+
+ return component;
+})( jQuery );
diff --git a/src/wp-includes/default-filters.php b/src/wp-includes/default-filters.php
index e6050774c6..ef412e9e6a 100644
--- a/src/wp-includes/default-filters.php
+++ b/src/wp-includes/default-filters.php
@@ -164,7 +164,11 @@ add_filter( 'list_cats', 'wptexturize' );
add_filter( 'wp_sprintf', 'wp_sprintf_l', 10, 2 );
-add_filter( 'widget_text', 'balanceTags' );
+add_filter( 'widget_text', 'balanceTags' );
+add_filter( 'widget_text_content', 'capital_P_dangit', 11 );
+add_filter( 'widget_text_content', 'wptexturize' );
+add_filter( 'widget_text_content', 'convert_smilies', 20 );
+add_filter( 'widget_text_content', 'wpautop' );
add_filter( 'date_i18n', 'wp_maybe_decline_date' );
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index 43209721f5..344bc4559b 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -602,6 +602,8 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ) );
$scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable' ), false, 1 );
+ $scripts->add( 'text-widgets', "/wp-admin/js/widgets/text-widgets$suffix.js", array( 'jquery', 'backbone', 'editor', 'wp-util' ) );
+ $scripts->add_inline_script( 'text-widgets', 'wp.textWidgets.init();', 'after' );
$scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'wp-backbone', 'wp-a11y' ), false, 1 );
diff --git a/src/wp-includes/widgets/class-wp-widget-text.php b/src/wp-includes/widgets/class-wp-widget-text.php
index a379fd719d..434a123f90 100644
--- a/src/wp-includes/widgets/class-wp-widget-text.php
+++ b/src/wp-includes/widgets/class-wp-widget-text.php
@@ -28,10 +28,30 @@ class WP_Widget_Text extends WP_Widget {
'description' => __( 'Arbitrary text or HTML.' ),
'customize_selective_refresh' => true,
);
- $control_ops = array( 'width' => 400, 'height' => 350 );
+ $control_ops = array(
+ 'width' => 400,
+ 'height' => 350,
+ );
parent::__construct( 'text', __( 'Text' ), $widget_ops, $control_ops );
}
+ /**
+ * Add hooks for enqueueing assets when registering all widget instances of this widget class.
+ *
+ * @since 4.8.0
+ * @access public
+ */
+ public function _register() {
+
+ // Note that the widgets component in the customizer will also do the 'admin_print_scripts-widgets.php' action in WP_Customize_Widgets::print_scripts().
+ add_action( 'admin_print_scripts-widgets.php', array( $this, 'enqueue_admin_scripts' ) );
+
+ // Note that the widgets component in the customizer will also do the 'admin_footer-widgets.php' action in WP_Customize_Widgets::print_footer_scripts().
+ add_action( 'admin_footer-widgets.php', array( $this, 'render_control_template_scripts' ) );
+
+ parent::_register();
+ }
+
/**
* Outputs the content for the current Text widget instance.
*
@@ -61,11 +81,34 @@ class WP_Widget_Text extends WP_Widget {
*/
$text = apply_filters( 'widget_text', $widget_text, $instance, $this );
+ if ( isset( $instance['filter'] ) ) {
+ if ( 'content' === $instance['filter'] ) {
+
+ /**
+ * Filters the content of the Text widget to apply changes expected from the visual (TinyMCE) editor.
+ *
+ * By default a subset of the_content filters are applied, including wpautop and wptexturize.
+ *
+ * @since 4.8.0
+ *
+ * @param string $widget_text The widget content.
+ * @param array $instance Array of settings for the current widget.
+ * @param WP_Widget_Text $this Current Text widget instance.
+ */
+ $text = apply_filters( 'widget_text_content', $widget_text, $instance, $this );
+
+ } elseif ( $instance['filter'] ) {
+ $text = wpautop( $text ); // Back-compat for instances prior to 4.8.
+ }
+ }
+
echo $args['before_widget'];
if ( ! empty( $title ) ) {
echo $args['before_title'] . $title . $args['after_title'];
- } ?>
-
+ }
+
+ ?>
+
'', 'text' => '' ) );
- $filter = isset( $instance['filter'] ) ? $instance['filter'] : 0;
- $title = sanitize_text_field( $instance['title'] );
+ $instance = wp_parse_args(
+ (array) $instance,
+ array(
+ 'title' => '',
+ 'text' => '',
+ )
+ );
?>
-
-
+
+
+
-
-
- />
+ /**
+ * Render form template scripts.
+ *
+ * @since 4.8.0
+ * @access public
+ */
+ public function render_control_template_scripts() {
+ ?>
+
_register();
+
+ $this->assertEquals( 10, has_action( 'admin_print_scripts-widgets.php', array( $widget, 'enqueue_admin_scripts' ) ) );
+ $this->assertEquals( 10, has_action( 'admin_footer-widgets.php', array( $widget, 'render_control_template_scripts' ) ) );
+ }
+
+ /**
+ * Test widget method.
+ *
+ * @covers WP_Widget_Text::widget
+ */
+ function test_widget() {
+ $widget = new WP_Widget_Text();
+ $text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n Praesent ut turpis consequat lorem volutpat bibendum vitae vitae ante.";
+
+ $args = array(
+ 'before_title' => '',
+ 'after_title' => "
\n",
+ 'before_widget' => '\n",
+ );
+ $instance = array(
+ 'title' => 'Foo',
+ 'text' => $text,
+ 'filter' => false,
+ );
+
+ add_filter( 'widget_text_content', array( $this, 'filter_widget_text_content' ), 10, 3 );
+ add_filter( 'widget_text', array( $this, 'filter_widget_text' ), 10, 3 );
+
+ // Test with filter=false.
+ ob_start();
+ $widget->widget( $args, $instance );
+ $output = ob_get_clean();
+ $this->assertNotContains( '', $output );
+ $this->assertNotContains( '
', $output );
+ $this->assertEmpty( $this->widget_text_content_args );
+ $this->assertNotEmpty( $this->widget_text_args );
+
+ // Test with filter=true.
+ $instance['filter'] = true;
+ ob_start();
+ $widget->widget( $args, $instance );
+ $output = ob_get_clean();
+ $this->assertContains( '
', $output );
+ $this->assertContains( '
', $output );
+ $this->assertNotEmpty( $this->widget_text_args );
+ $this->assertEquals( $instance['text'], $this->widget_text_args[0] );
+ $this->assertEquals( $instance, $this->widget_text_args[1] );
+ $this->assertEquals( $widget, $this->widget_text_args[2] );
+ $this->assertEmpty( $this->widget_text_content_args );
+
+ // Test with filter=content, the upgraded widget.
+ $instance['filter'] = 'content';
+ ob_start();
+ $widget->widget( $args, $instance );
+ $output = ob_get_clean();
+ $this->assertContains( '
', $output );
+ $this->assertContains( '
', $output );
+ $this->assertCount( 3, $this->widget_text_args );
+ $this->assertEquals( $instance['text'], $this->widget_text_args[0] );
+ $this->assertEquals( $instance, $this->widget_text_args[1] );
+ $this->assertEquals( $widget, $this->widget_text_args[2] );
+ $this->assertCount( 3, $this->widget_text_content_args );
+ $this->assertEquals( wpautop( $instance['text'] ), $this->widget_text_content_args[0] );
+ $this->assertEquals( $instance, $this->widget_text_content_args[1] );
+ $this->assertEquals( $widget, $this->widget_text_content_args[2] );
+ }
+
+ /**
+ * Filters the content of the Text widget.
+ *
+ * @param string $widget_text The widget content.
+ * @param array $instance Array of settings for the current widget.
+ * @param WP_Widget_Text $widget Current Text widget instance.
+ * @return string Widget text.
+ */
+ function filter_widget_text( $widget_text, $instance, $widget ) {
+ $this->widget_text_args = func_get_args();
+
+ return $widget_text;
+ }
+
+ /**
+ * Filters the content of the Text widget to apply changes expected from the visual (TinyMCE) editor.
+ *
+ * @param string $widget_text The widget content.
+ * @param array $instance Array of settings for the current widget.
+ * @param WP_Widget_Text $widget Current Text widget instance.
+ * @return string Widget content.
+ */
+ function filter_widget_text_content( $widget_text, $instance, $widget ) {
+ $this->widget_text_content_args = func_get_args();
+
+ return $widget_text;
+ }
+
+ /**
+ * Test update method.
+ *
+ * @covers WP_Widget_Text::update
+ */
+ function test_update() {
+ $widget = new WP_Widget_Text();
+ $instance = array(
+ 'title' => "The\nTitle",
+ 'text' => "The\n\nText",
+ 'filter' => false,
+ );
+
+ wp_set_current_user( $this->factory()->user->create( array(
+ 'role' => 'administrator',
+ ) ) );
+
+ // Should return valid instance.
+ $expected = array(
+ 'title' => sanitize_text_field( $instance['title'] ),
+ 'text' => $instance['text'],
+ 'filter' => 'content',
+ );
+ $result = $widget->update( $instance, array() );
+ $this->assertEquals( $result, $expected );
+ $this->assertTrue( ! empty( $expected['filter'] ), 'Expected filter prop to be truthy, to handle case where 4.8 is downgraded to 4.7.' );
+
+ // Make sure KSES is applying as expected.
+ add_filter( 'map_meta_cap', array( $this, 'grant_unfiltered_html_cap' ), 10, 2 );
+ $this->assertTrue( current_user_can( 'unfiltered_html' ) );
+ $instance['text'] = '';
+ $expected['text'] = $instance['text'];
+ $result = $widget->update( $instance, array() );
+ $this->assertEquals( $result, $expected );
+
+ remove_filter( 'map_meta_cap', array( $this, 'grant_unfiltered_html_cap' ) );
+ add_filter( 'map_meta_cap', array( $this, 'revoke_unfiltered_html_cap' ), 10, 2 );
+ $this->assertFalse( current_user_can( 'unfiltered_html' ) );
+ $instance['text'] = '';
+ $expected['text'] = wp_kses_post( $instance['text'] );
+ $result = $widget->update( $instance, array() );
+ $this->assertEquals( $result, $expected );
+ remove_filter( 'map_meta_cap', array( $this, 'revoke_unfiltered_html_cap' ), 10, 2 );
+ }
+
+ /**
+ * Grant unfiltered_html cap via map_meta_cap.
+ *
+ * @param array $caps Returns the user's actual capabilities.
+ * @param string $cap Capability name.
+ * @return array Caps.
+ */
+ function grant_unfiltered_html_cap( $caps, $cap ) {
+ if ( 'unfiltered_html' === $cap ) {
+ $caps = array_diff( $caps, array( 'do_not_allow' ) );
+ $caps[] = 'unfiltered_html';
+ }
+ return $caps;
+ }
+
+ /**
+ * Revoke unfiltered_html cap via map_meta_cap.
+ *
+ * @param array $caps Returns the user's actual capabilities.
+ * @param string $cap Capability name.
+ * @return array Caps.
+ */
+ function revoke_unfiltered_html_cap( $caps, $cap ) {
+ if ( 'unfiltered_html' === $cap ) {
+ $caps = array_diff( $caps, array( 'unfiltered_html' ) );
+ $caps[] = 'do_not_allow';
+ }
+ return $caps;
+ }
+
+ /**
+ * Test enqueue_admin_scripts method.
+ *
+ * @covers WP_Widget_Text::enqueue_admin_scripts
+ */
+ function test_enqueue_admin_scripts() {
+ set_current_screen( 'widgets.php' );
+ $widget = new WP_Widget_Text();
+ $widget->enqueue_admin_scripts();
+
+ $this->assertTrue( wp_script_is( 'text-widgets' ) );
+ }
+
+ /**
+ * Test render_control_template_scripts method.
+ *
+ * @covers WP_Widget_Text::render_control_template_scripts
+ */
+ function test_render_control_template_scripts() {
+ $widget = new WP_Widget_Text();
+
+ ob_start();
+ $widget->render_control_template_scripts();
+ $output = ob_get_clean();
+
+ $this->assertContains( '