Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/wp-admin/css/widgets.css
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,12 @@ div#widgets-right .closed .widgets-sortables {
border-left: 1px solid #dcdcde;
}

/* Sit next to the JS expand/collapse button rather than stacking below it. */
.widget-title-action .widget-control-edit {
display: inline-block;
vertical-align: top;
}

#widgets-left .widget-control-edit:hover,
#widgets-right .widget-control-edit:hover {
color: #fff;
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/includes/widgets.php
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ function wp_widget_control( $sidebar_args ) {
</span>
<span class="toggle-indicator" aria-hidden="true"></span>
</button>
<a class="widget-control-edit hide-if-js" href="<?php echo esc_url( add_query_arg( $query_arg ) ); ?>">
<a class="widget-control-edit" href="<?php echo esc_url( add_query_arg( $query_arg ) ); ?>">
<span class="edit"><?php _ex( 'Edit', 'widget' ); ?></span>
<span class="add"><?php _ex( 'Add', 'widget' ); ?></span>
<span class="screen-reader-text"><?php echo $widget_title; ?></span>
Expand Down
104 changes: 59 additions & 45 deletions tests/phpunit/tests/widgets.php
Original file line number Diff line number Diff line change
Expand Up @@ -789,6 +789,57 @@ public function test_wp_widget_save_settings_delete() {
* @see wp_widget_control()
*/
public function test_wp_widget_control() {
$control = $this->render_search_widget_control();
$this->assertNotEmpty( $control );

$this->assertStringContainsString( '<div class="widget-top">', $control );
$this->assertStringContainsString( '<div class="widget-title-action">', $control );
$this->assertStringContainsString( '<div class="widget-title">', $control );
$this->assertStringContainsString( '<form method="post">', $control );
$this->assertStringContainsString( '<div class="widget-content">', $control );
$this->assertStringContainsString( '<input class="widefat"', $control );
$this->assertStringContainsString( '<input type="hidden" name="id_base" class="id_base" value="search"', $control );
$this->assertStringContainsString( '<div class="widget-control-actions">', $control );
$this->assertStringContainsString( '<div class="alignleft">', $control );
$this->assertStringContainsString( 'widget-control-remove', $control );
$this->assertStringContainsString( 'widget-control-close', $control );
$this->assertStringContainsString( '<div class="alignright">', $control );
$this->assertStringContainsString( '<input type="submit" name="savewidget"', $control );

$param_overrides = array(
'before_form' => '<!-- before_form -->',
'after_form' => '<!-- after_form -->',
'before_widget_content' => '<!-- before_widget_content -->',
'after_widget_content' => '<!-- after_widget_content -->',
);
$control = $this->render_search_widget_control( $param_overrides );
$this->assertNotEmpty( $control );
$this->assertStringNotContainsString( '<form method="post">', $control );
$this->assertStringNotContainsString( '<div class="widget-content">', $control );

foreach ( $param_overrides as $contained ) {
$this->assertStringContainsString( $contained, $control );
}
}

/**
* @ticket 52399
* @see wp_widget_control()
*/
public function test_wp_widget_control_edit_link_is_not_hidden_from_js() {
$control = $this->render_search_widget_control();

$this->assertStringContainsString( 'class="widget-control-edit"', $control, 'The Edit/Add text link should remain visible when JavaScript is available, as a plain-text path to the accessible single-widget edit screen.' );
$this->assertStringNotContainsString( 'widget-control-edit hide-if-js', $control );
Comment on lines +832 to +833
}

/**
* Registers a `search-2` widget in `sidebar-1` and renders its control markup via wp_widget_control().
*
* @param array $param_overrides Optional. Extra values merged into the sidebar params passed to wp_widget_control().
* @return string The rendered control markup.
*/
private function render_search_widget_control( array $param_overrides = array() ) {
global $wp_registered_widgets;

update_option(
Expand All @@ -810,11 +861,13 @@ public function test_wp_widget_control() {

wp_widgets_init();
require_once ABSPATH . 'wp-admin/includes/widgets.php';
$widget_id = 'search-2';
$widget = $wp_registered_widgets[ $widget_id ];
$params = array(
'widget_id' => $widget['id'],
'widget_name' => $widget['name'],
$widget = $wp_registered_widgets['search-2'];
$params = array_merge(
array(
'widget_id' => $widget['id'],
'widget_name' => $widget['name'],
),
$param_overrides
);
$control_args = array(
0 => $params,
Expand All @@ -824,46 +877,7 @@ public function test_wp_widget_control() {

ob_start();
wp_widget_control( ...$sidebar_args );
$control = ob_get_clean();
$this->assertNotEmpty( $control );

$this->assertStringContainsString( '<div class="widget-top">', $control );
$this->assertStringContainsString( '<div class="widget-title-action">', $control );
$this->assertStringContainsString( '<div class="widget-title">', $control );
$this->assertStringContainsString( '<form method="post">', $control );
$this->assertStringContainsString( '<div class="widget-content">', $control );
$this->assertStringContainsString( '<input class="widefat"', $control );
$this->assertStringContainsString( '<input type="hidden" name="id_base" class="id_base" value="search"', $control );
$this->assertStringContainsString( '<div class="widget-control-actions">', $control );
$this->assertStringContainsString( '<div class="alignleft">', $control );
$this->assertStringContainsString( 'widget-control-remove', $control );
$this->assertStringContainsString( 'widget-control-close', $control );
$this->assertStringContainsString( '<div class="alignright">', $control );
$this->assertStringContainsString( '<input type="submit" name="savewidget"', $control );

$param_overrides = array(
'before_form' => '<!-- before_form -->',
'after_form' => '<!-- after_form -->',
'before_widget_content' => '<!-- before_widget_content -->',
'after_widget_content' => '<!-- after_widget_content -->',
);
$params = array_merge( $params, $param_overrides );
$control_args = array(
0 => $params,
1 => $widget['params'][0],
);
$sidebar_args = wp_list_widget_controls_dynamic_sidebar( $control_args );

ob_start();
wp_widget_control( ...$sidebar_args );
$control = ob_get_clean();
$this->assertNotEmpty( $control );
$this->assertStringNotContainsString( '<form method="post">', $control );
$this->assertStringNotContainsString( '<div class="widget-content">', $control );

foreach ( $param_overrides as $contained ) {
$this->assertStringContainsString( $contained, $control );
}
return ob_get_clean();
}

public function test_the_widget_custom_before_title_arg() {
Expand Down
Loading