diff -u b/core/modules/edit/js/editors/plainTextEditor.js b/core/modules/edit/js/editors/plainTextEditor.js --- b/core/modules/edit/js/editors/plainTextEditor.js +++ b/core/modules/edit/js/editors/plainTextEditor.js @@ -26,7 +26,7 @@ $textElement = this.$textElement = this.$el.find('.field-item:first'); } else { - $textElement = this.$textElement = this.$el; + $textElement = this.$textElement = this.$el; } editorModel.set('originalValue', $.trim(this.$textElement.text())); diff -u b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php --- b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php +++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php @@ -53,7 +53,7 @@ // Instantiate the widget object from the stored display properties. if (($configuration = $this->getComponent($field_name)) && isset($configuration['type']) && ($definition = $this->getFieldDefinition($field_name))) { $widget = $this->pluginManager->getInstance(array( - 'field_definition' => $this->getFieldDefinition($field_name), + 'field_definition' => $definition, 'form_mode' => $this->originalMode, // No need to prepare, defaults have been merged in setComponent(). 'prepare' => FALSE, diff -u b/core/modules/entity/lib/Drupal/entity/EntityDisplayBase.php b/core/modules/entity/lib/Drupal/entity/EntityDisplayBase.php --- b/core/modules/entity/lib/Drupal/entity/EntityDisplayBase.php +++ b/core/modules/entity/lib/Drupal/entity/EntityDisplayBase.php @@ -206,14 +206,13 @@ // and visibility flag in the EntityDisplay. // - For some of them (e.g. node title), the custom rendering code has been // removed in favor of regular widgets/formatters. Their display options - // are "upgraded" to those of a field (widget/formatter + settings) at + // are "upgraded" to those of a field (widget/formatter + settings) at // runtime using hook_entity_display_alter(). // The getComponent() / setComponent() methods handle this by treating // components as "extra fields" if they are registered as such, *and* if // their display options contain no 'type' entry specifying a widget or // formatter. // @todo Cleanup after https://drupal.org/node/2144919 is fixed. - $extra_fields = field_info_extra_fields($this->targetEntityType, $this->bundle, $this->displayContext); if (isset($extra_fields[$name]) && !isset($this->content[$name]['type'])) { // If we have explicit settings, return an array or NULL depending on diff -u b/core/modules/field/field.attach.inc b/core/modules/field/field.attach.inc --- b/core/modules/field/field.attach.inc +++ b/core/modules/field/field.attach.inc @@ -8,7 +8,6 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\entity\Entity\EntityFormDisplay; -use Drupal\field\FieldInstanceInterface; /** * @defgroup field_attach Field Attach API @@ -65,8 +64,8 @@ * @param string $method * The name of the method to invoke. * @param callable $target_function - * A function that receives a field definition and returns the object on - * which the method should be invoked. + * A function that receives a FieldDefinitionInterface object and returns the + * object on which the method should be invoked. * @param \Drupal\Core\Entity\EntityInterface $entity * The fully formed $entity_type entity. * @param mixed $a