Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3094783 by ravi.shankar, tim.plunkett, ridhimaabrol24, Kristen Pol, phenaproxima: Do not use the internal data attribute for disable-refocus

merge-requests/25/head
Alex Pott 2020-09-03 20:23:03 +01:00
parent b1fc8e03b4
commit df7a51943c
No known key found for this signature in database
GPG Key ID: 31905460D4A69276
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/modules/media_library/src/Plugin/Field/FieldWidget/MediaLibraryWidget.php
View File

@ -484,9 +484,6 @@ class MediaLibraryWidget extends WidgetBase implements TrustedCallbackInterface
'class' => [
'js-media-library-open-button',
],
// The jQuery UI dialog automatically moves focus to the first :tabbable
// element of the modal, so we need to disable refocus on the button.
'data-disable-refocus' => 'true',
],
'#media_library_state' => $state,
'#ajax' => [
@ -495,6 +492,9 @@ class MediaLibraryWidget extends WidgetBase implements TrustedCallbackInterface
'type' => 'throbber',
'message' => $this->t('Opening media library.'),
],
// The AJAX system automatically moves focus to the first :tabbable
// element of the modal, so we need to disable refocus on the button.
'disable-refocus' => TRUE,
],
// Allow the media library to be opened even if there are form errors.
'#limit_validation_errors' => [],

12
core/modules/media_library/src/Plugin/views/field/MediaLibrarySelectForm.php
View File

@ -90,20 +90,14 @@ class MediaLibrarySelectForm extends FieldPluginBase {
'query' => $query,
],
'callback' => [static::class, 'updateWidget'],
// The AJAX system automatically moves focus to the first :tabbable
// element of the modal, so we need to disable refocus on the button.
'disable-refocus' => TRUE,
];
$form['actions']['submit']['#value'] = $this->t('Insert selected');
$form['actions']['submit']['#button_type'] = 'primary';
$form['actions']['submit']['#field_id'] = $selection_field_id;
// By default, the AJAX system tries to move the focus back to the element
// that triggered the AJAX request. Since the media library is closed after
// clicking the select button, the focus can't be moved back. We need to set
// the 'data-disable-refocus' attribute to prevent the AJAX system from
// moving focus to a random element. The select button triggers an update in
// the opener, and the opener should be responsible for moving the focus. An
// example of this can be seen in MediaLibraryWidget::updateWidget().
// @see \Drupal\media_library\Plugin\Field\FieldWidget\MediaLibraryWidget::updateWidget()
$form['actions']['submit']['#attributes']['data-disable-refocus'] = 'true';
}
/**