Commit a40f556f authored by Dave Reid's avatar Dave Reid

Issue #2706045 by Dave Reid: Deprecated the data-entity-label attribute and...

Issue #2706045 by Dave Reid: Deprecated the data-entity-label attribute and set the dialog title in EntityEmbedDialog. (#217)
parent 4161b814
...@@ -51,11 +51,9 @@ ...@@ -51,11 +51,9 @@
} }
} }
var entity_label = data.label ? data.label : existingValues['data-entity-label'];
var embed_button_id = data.id ? data.id : existingValues['data-embed-button']; var embed_button_id = data.id ? data.id : existingValues['data-embed-button'];
var dialogSettings = { var dialogSettings = {
title: existingElement ? 'Edit ' + entity_label : 'Insert ' + entity_label,
dialogClass: 'entity-select-dialog', dialogClass: 'entity-select-dialog',
resizable: false resizable: false
}; };
......
...@@ -11,6 +11,7 @@ use Drupal\Component\Utility\Html; ...@@ -11,6 +11,7 @@ use Drupal\Component\Utility\Html;
use Drupal\Core\Ajax\AjaxResponse; use Drupal\Core\Ajax\AjaxResponse;
use Drupal\Core\Ajax\CloseModalDialogCommand; use Drupal\Core\Ajax\CloseModalDialogCommand;
use Drupal\Core\Ajax\HtmlCommand; use Drupal\Core\Ajax\HtmlCommand;
use Drupal\Core\Ajax\SetDialogTitleCommand;
use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Form\FormBase; use Drupal\Core\Form\FormBase;
...@@ -205,6 +206,8 @@ class EntityEmbedDialog extends FormBase { ...@@ -205,6 +206,8 @@ class EntityEmbedDialog extends FormBase {
} }
} }
$form['#title'] = $this->t('Select @type to embed', array('@type' => $entity_type->getLowercaseLabel()));
if ($this->entityBrowser) { if ($this->entityBrowser) {
$this->eventDispatcher->addListener(Events::REGISTER_JS_CALLBACKS, [$this, 'registerJSCallback']); $this->eventDispatcher->addListener(Events::REGISTER_JS_CALLBACKS, [$this, 'registerJSCallback']);
...@@ -280,9 +283,11 @@ class EntityEmbedDialog extends FormBase { ...@@ -280,9 +283,11 @@ class EntityEmbedDialog extends FormBase {
* The form structure. * The form structure.
*/ */
public function buildReviewStep(array &$form, FormStateInterface $form_state) { public function buildReviewStep(array &$form, FormStateInterface $form_state) {
/** @var \Drupal\embed\EmbedButtonInterface $embed_button */ /** @var \Drupal\Core\Entity\EntityInterface $entity */
$entity = $form_state->get('entity'); $entity = $form_state->get('entity');
$form['#title'] = $this->t('Review selected @type', array('@type' => $entity->getEntityType()->getLowercaseLabel()));
$form['selection'] = [ $form['selection'] = [
'#markup' => $entity->label() '#markup' => $entity->label()
]; ];
...@@ -339,9 +344,12 @@ class EntityEmbedDialog extends FormBase { ...@@ -339,9 +344,12 @@ class EntityEmbedDialog extends FormBase {
$embed_button = $form_state->get('embed_button'); $embed_button = $form_state->get('embed_button');
/** @var \Drupal\editor\EditorInterface $editor */ /** @var \Drupal\editor\EditorInterface $editor */
$editor = $form_state->get('editor'); $editor = $form_state->get('editor');
/** @var \Drupal\Core\Entity\EntityInterface $entity */
$entity = $form_state->get('entity'); $entity = $form_state->get('entity');
$values = $form_state->getValues(); $values = $form_state->getValues();
$form['#title'] = $this->t('Embed @type', array('@type' => $entity->getEntityType()->getLowercaseLabel()));
$entity_label = ''; $entity_label = '';
try { try {
$entity_label = $entity->link(); $entity_label = $entity->link();
...@@ -409,10 +417,6 @@ class EntityEmbedDialog extends FormBase { ...@@ -409,10 +417,6 @@ class EntityEmbedDialog extends FormBase {
'#type' => 'value', '#type' => 'value',
'#value' => $embed_button->id(), '#value' => $embed_button->id(),
); );
$form['attributes']['data-entity-label'] = array(
'#type' => 'value',
'#value' => $embed_button->label(),
);
$plugin_id = !empty($values['attributes']['data-entity-embed-display']) ? $values['attributes']['data-entity-embed-display'] : $entity_element['data-entity-embed-display']; $plugin_id = !empty($values['attributes']['data-entity-embed-display']) ? $values['attributes']['data-entity-embed-display'] : $entity_element['data-entity-embed-display'];
if (!empty($plugin_id)) { if (!empty($plugin_id)) {
if (is_string($entity_element['data-entity-embed-settings'])) { if (is_string($entity_element['data-entity-embed-settings'])) {
...@@ -599,6 +603,7 @@ class EntityEmbedDialog extends FormBase { ...@@ -599,6 +603,7 @@ class EntityEmbedDialog extends FormBase {
$rebuild_form = $this->formBuilder->rebuildForm('entity_embed_dialog', $form_state, $form); $rebuild_form = $this->formBuilder->rebuildForm('entity_embed_dialog', $form_state, $form);
unset($rebuild_form['#prefix'], $rebuild_form['#suffix']); unset($rebuild_form['#prefix'], $rebuild_form['#suffix']);
$response->addCommand(new HtmlCommand('#entity-embed-dialog-form', $rebuild_form)); $response->addCommand(new HtmlCommand('#entity-embed-dialog-form', $rebuild_form));
$response->addCommand(new SetDialogTitleCommand('', $rebuild_form['#title']));
return $response; return $response;
} }
...@@ -636,6 +641,7 @@ class EntityEmbedDialog extends FormBase { ...@@ -636,6 +641,7 @@ class EntityEmbedDialog extends FormBase {
$rebuild_form = $this->formBuilder->rebuildForm('entity_embed_dialog', $form_state, $form); $rebuild_form = $this->formBuilder->rebuildForm('entity_embed_dialog', $form_state, $form);
unset($rebuild_form['#prefix'], $rebuild_form['#suffix']); unset($rebuild_form['#prefix'], $rebuild_form['#suffix']);
$response->addCommand(new HtmlCommand('#entity-embed-dialog-form', $rebuild_form)); $response->addCommand(new HtmlCommand('#entity-embed-dialog-form', $rebuild_form));
$response->addCommand(new SetDialogTitleCommand('', $rebuild_form['#title']));
} }
return $response; return $response;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment