.../Plugin/Field/FieldWidget/AuthorAutocompleteWidget.php | 3 --- .../Field/FieldWidget/RouteBasedAutocompleteWidget.php | 12 +++++++++--- .../Field/Plugin/Field/FieldWidget/TimestampWidget.php | 14 ++++++++++---- core/modules/node/lib/Drupal/node/NodeForm.php | 15 ++++++++------- .../text/Plugin/Field/FieldWidget/TextareaWidget.php | 4 ---- 5 files changed, 27 insertions(+), 21 deletions(-) diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/AuthorAutocompleteWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/AuthorAutocompleteWidget.php index 560cfb1..4cff988 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/AuthorAutocompleteWidget.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/AuthorAutocompleteWidget.php @@ -18,9 +18,6 @@ * label = @Translation("Author user reference autocomplete"), * field_types = { * "entity_reference", - * }, - * settings = { - * "route_name" = "", * } * ) */ diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/RouteBasedAutocompleteWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/RouteBasedAutocompleteWidget.php index 40ed80b..cf8b2c3 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/RouteBasedAutocompleteWidget.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/RouteBasedAutocompleteWidget.php @@ -18,9 +18,6 @@ * label = @Translation("Entity reference autocomplete (route-based)"), * field_types = { * "entity_reference", - * }, - * settings = { - * "route_name" = "", * } * ) */ @@ -29,6 +26,15 @@ class RouteBasedAutocompleteWidget extends WidgetBase { /** * {@inheritdoc} */ + public static function defaultSettings() { + return array( + 'route_name' => '', + ) + parent::defaultSettings(); + } + + /** + * {@inheritdoc} + */ public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, array &$form_state) { $element['target_id'] = $element + array( '#type' => 'textfield', diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/TimestampWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/TimestampWidget.php index 1d27fe7..a309a9b 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/TimestampWidget.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/TimestampWidget.php @@ -20,10 +20,7 @@ * field_types = { * "timestamp", * "created", - * }, - * settings = { - * "use_request_time_on_empty" = FALSE, - * }, + * } * ) */ class TimestampWidget extends WidgetBase { @@ -31,6 +28,15 @@ class TimestampWidget extends WidgetBase { /** * {@inheritdoc} */ + public static function defaultSettings() { + return array( + 'use_request_time_on_empty' => FALSE + ) + parent::defaultSettings(); + } + + /** + * {@inheritdoc} + */ public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, array &$form_state) { $default_value = isset($items[$delta]->value) ? format_date($items[$delta]->value, 'custom', 'Y-m-d H:i:s O') : ''; $element['value'] = $element + array( diff --git a/core/modules/node/lib/Drupal/node/NodeForm.php b/core/modules/node/lib/Drupal/node/NodeForm.php index 2e78d37..3ab5810 100644 --- a/core/modules/node/lib/Drupal/node/NodeForm.php +++ b/core/modules/node/lib/Drupal/node/NodeForm.php @@ -55,6 +55,14 @@ public function form(array $form, array &$form_state) { /** @var \Drupal\node\NodeInterface $node */ $node = $this->entity; + // Create the "advanced" vertical tabs before building the form, so that + // field widgets may detect its presence and choose to live there. + $form['advanced'] = array( + '#type' => 'vertical_tabs', + '#attributes' => array('class' => array('entity-meta')), + '#weight' => 99, + ); + $form = parent::form($form, $form_state, $node); if ($this->operation == 'edit') { @@ -90,13 +98,6 @@ public function form(array $form, array &$form_state) { '#default_value' => $node->getUntranslated()->language()->id, '#languages' => Language::STATE_ALL, '#access' => isset($language_configuration['language_show']) && $language_configuration['language_show'], - ); - - - $form['advanced'] = array( - '#type' => 'vertical_tabs', - '#attributes' => array('class' => array('entity-meta')), - '#weight' => 99, ); // Add a log field if the "Create new revision" option is checked, or if diff --git a/core/modules/text/lib/Drupal/text/Plugin/Field/FieldWidget/TextareaWidget.php b/core/modules/text/lib/Drupal/text/Plugin/Field/FieldWidget/TextareaWidget.php index 8474b2b..1b41a93 100644 --- a/core/modules/text/lib/Drupal/text/Plugin/Field/FieldWidget/TextareaWidget.php +++ b/core/modules/text/lib/Drupal/text/Plugin/Field/FieldWidget/TextareaWidget.php @@ -20,10 +20,6 @@ * field_types = { * "text_long", * "string_long", - * }, - * settings = { - * "rows" = "5", - * "placeholder" = "" * } * ) */