Unverified Commit a2f5778f authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3087405 by andrewmacpherson, bnjmnm, phenaproxima, rainbreaw, annagaz,... 

Issue #3087405 by andrewmacpherson, bnjmnm, phenaproxima, rainbreaw, annagaz, cboyden: For screenreader users using the media and media library UI, the words "remove" and "removed" sound too similar
parent cd325f15

core/modules/media_library/src/Plugin/Field/FieldWidget/MediaLibraryWidget.php

+3 −1
Changes for core/modules/media_library/src/Plugin/Field/FieldWidget/MediaLibraryWidget.php: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -667,7 +667,9 @@ public static function updateWidget(array $form, FormStateInterface $form_state) 


    // Announce the updated content to screen readers.

    if ($is_remove_button) {

      $announcement = t('Removed @label.', ['@label' => Media::load($field_state['removed_item_id'])->label()]);

      $announcement = t('@label has been removed.', [

        '@label' => Media::load($field_state['removed_item_id'])->label(),

      ]);

    }

    else {

      $new_items = count(static::getNewMediaItems($element, $form_state));

core/modules/media_library/tests/src/FunctionalJavascript/EntityReferenceWidgetTest.php

+4 −4
Changes for core/modules/media_library/tests/src/FunctionalJavascript/EntityReferenceWidgetTest.php: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ public function testWidget() { 
    $button = $assert_session->buttonExists('Remove', $wrapper);

    $this->assertSame('Remove Dog', $button->getAttribute('aria-label'));

    $button->press();

    $this->waitForText('Removed Dog.');

    $this->waitForText('Dog has been removed.');

    // Assert the focus is set back on the open button of the media field.

    $this->assertJsCondition('jQuery("#field_twin_media-media-library-wrapper .js-media-library-open-button").is(":focus")');
@@ -218,9 +218,9 @@ public function testWidget() { 
    $assert_session->hiddenFieldValueEquals('field_twin_media[selection][0][target_id]', 4);

    $assert_session->hiddenFieldValueEquals('field_twin_media[selection][1][target_id]', 4);

    $wrapper->pressButton('Remove');

    $this->waitForText('Removed Dog.');

    $this->waitForText('Dog has been removed.');

    $wrapper->pressButton('Remove');

    $this->waitForText('Removed Dog.');

    $this->waitForText('Dog has been removed.');

    $result = $wrapper->waitFor(10, function ($wrapper) {

      /** @var \Behat\Mink\Element\NodeElement $wrapper */

      return $wrapper->findButton('Remove') == NULL;
@@ -302,7 +302,7 @@ public function testWidget() { 
    $button = $assert_session->buttonExists('Remove', $wrapper);

    $this->assertSame('Remove Cat', $button->getAttribute('aria-label'));

    $button->press();

    $this->waitForText('Removed Cat.');

    $this->waitForText('Cat has been removed.');

    // Assert the focus is set to the wrapper of the other selected item.

    $this->assertJsCondition('jQuery("#field_twin_media-media-library-wrapper [data-media-library-item-delta]").is(":focus")');

    $assert_session->elementTextNotContains('css', '#field_twin_media-media-library-wrapper', 'Cat');