here.
- $id = $element['#views_ui_ajax_data']['wrapper'];
+ $id = substr($element['#views_ui_ajax_data']['wrapper_selector'], 1);
$refresh_element += array(
'#prefix' => '',
'#suffix' => '',
diff --git a/core/modules/views_ui/js/ajax.js b/core/modules/views_ui/js/ajax.js
index d4ff764..489a1da 100644
--- a/core/modules/views_ui/js/ajax.js
+++ b/core/modules/views_ui/js/ajax.js
@@ -210,7 +210,7 @@
return true;
}
- element_settings.wrapper = 'views-preview-wrapper';
+ element_settings.wrapper_selector = '.views-preview-wrapper';
element_settings.method = 'replaceWith';
element_settings.base = $(this).attr('id');
element_settings.element = this;
@@ -234,7 +234,7 @@
return true;
}
- element_settings.wrapper = 'views-preview-wrapper';
+ element_settings.wrapper_selector = '.views-preview-wrapper';
element_settings.method = 'replaceWith';
element_settings.event = 'click';
element_settings.base = $(this).attr('id');
diff --git a/core/modules/views_ui/src/Tests/PreviewTest.php b/core/modules/views_ui/src/Tests/PreviewTest.php
index d2dcd12..32b0491 100644
--- a/core/modules/views_ui/src/Tests/PreviewTest.php
+++ b/core/modules/views_ui/src/Tests/PreviewTest.php
@@ -320,7 +320,7 @@ protected function clickPreviewLinkAJAX($url, $row_count) {
$content = $this->content;
$drupal_settings = $this->drupalSettings;
$ajax_settings = array(
- 'wrapper' => 'views-preview-wrapper',
+ 'wrapper_selector' => '.views-preview-wrapper',
'method' => 'replaceWith',
);
$url = $this->getAbsoluteUrl($url);
diff --git a/core/modules/views_ui/src/ViewPreviewForm.php b/core/modules/views_ui/src/ViewPreviewForm.php
index 7b77929..0a46023 100644
--- a/core/modules/views_ui/src/ViewPreviewForm.php
+++ b/core/modules/views_ui/src/ViewPreviewForm.php
@@ -16,7 +16,7 @@ class ViewPreviewForm extends ViewFormBase {
public function form(array $form, FormStateInterface $form_state) {
$view = $this->entity;
- $form['#prefix'] = '
';
+ $form['#prefix'] = '
';
$form['#suffix'] = '
';
$form['#id'] = 'views-ui-preview-form';
@@ -85,7 +85,7 @@ protected function actions(array $form, FormStateInterface $form_state) {
'#id' => 'preview-submit',
'#ajax' => array(
'url' => Url::fromRoute('entity.view.preview_form', ['view' => $view->id(), 'display_id' => $this->displayID]),
- 'wrapper' => 'views-preview-wrapper',
+ 'wrapper_selector' => '.views-preview-wrapper',
'event' => 'click',
'progress' => array('type' => 'fullscreen'),
'method' => 'replaceWith',
diff --git a/core/tests/Drupal/Tests/Core/Render/Element/RenderElementTest.php b/core/tests/Drupal/Tests/Core/Render/Element/RenderElementTest.php
index 3b52f9a..118fe56 100644
--- a/core/tests/Drupal/Tests/Core/Render/Element/RenderElementTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/Element/RenderElementTest.php
@@ -44,33 +44,70 @@ protected function setUp() {
/**
* @covers ::preRenderAjaxForm
+ * @dataProvider providerTestPreRenderAjaxForm
*/
- public function testPreRenderAjaxForm() {
+ public function testPreRenderAjaxForm($element, $expected, $url) {
$request = Request::create('/test');
$request->query->set('foo', 'bar');
$this->requestStack->push($request);
$prophecy = $this->prophesize('Drupal\Core\Routing\UrlGeneratorInterface');
- $url = '/test?foo=bar&ajax_form=1';
$prophecy->generateFromRoute('
', [], ['query' => ['foo' => 'bar', FormBuilderInterface::AJAX_FORM_REQUEST => TRUE]], TRUE)
->willReturn((new GeneratedUrl())->setCacheContexts(['route'])->setGeneratedUrl($url));
$url_generator = $prophecy->reveal();
$this->container->set('url_generator', $url_generator);
- $element = [
- '#type' => 'select',
- '#id' => 'test',
- '#ajax' => [
- 'wrapper' => 'foo',
+
+ $result = RenderElement::preRenderAjaxForm($element);
+
+ $this->assertTrue($result['#ajax_processed']);
+ $this->assertSame($expected, $result['#attached']['drupalSettings']['ajax']['test']);
+ }
+
+ /**
+ * Provides test data for testPreRenderAjaxForm().
+ */
+ public function providerTestPreRenderAjaxForm() {
+ $data = [];
+ $data['wrapper_selector'] = [
+ [
+ '#type' => 'select',
+ '#id' => 'test',
+ '#ajax' => [
+ 'wrapper_selector' => '#foo',
+ 'callback' => 'test-callback',
+ ],
+ ],
+ [
+ 'wrapper_selector' => '#foo',
'callback' => 'test-callback',
+ 'event' => 'change',
+ 'url' => '/test?foo=bar&ajax_form=1',
+ 'dialogType' => 'ajax',
],
+ '/test?foo=bar&ajax_form=1',
];
-
- $element = RenderElement::preRenderAjaxForm($element);
-
- $this->assertTrue($element['#ajax_processed']);
- $this->assertEquals($url, $element['#attached']['drupalSettings']['ajax']['test']['url']);
+ // @todo Remove support for 'wrapper' and solely use 'wrapper_selector'.
+ $data['wrapper'] = [
+ [
+ '#type' => 'select',
+ '#id' => 'test',
+ '#ajax' => [
+ 'wrapper' => 'foo',
+ 'callback' => 'test-callback',
+ ],
+ ],
+ [
+ 'callback' => 'test-callback',
+ 'event' => 'change',
+ 'wrapper_selector' => '#foo',
+ 'url' => '/test?foo=bar&ajax_form=1',
+ 'dialogType' => 'ajax',
+ ],
+ '/test?foo=bar&ajax_form=1',
+ ];
+ return $data;
}
/**
@@ -93,7 +130,7 @@ public function testPreRenderAjaxFormWithQueryOptions() {
'#type' => 'select',
'#id' => 'test',
'#ajax' => [
- 'wrapper' => 'foo',
+ 'wrapper_selector' => '#foo',
'callback' => 'test-callback',
'options' => [
'query' => [